修改

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/UpdateLngPricePurPngAppSuDto.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.price.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.pictc.annotations.datalog.*;
 import com.xjrsoft.common.model.base.BaseModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -97,6 +98,7 @@ public class UpdateLngPricePurPngAppSuDto extends BaseModel implements Serializa
     */
     @LogField(name="价格生效年月",index=10)
     @ApiModelProperty("价格生效年月(YYYY-MM格式；日期缺省01)")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime dateFrom;
     
     /**

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPricePurPngAppSuDtlVo.java

@@ -41,7 +41,7 @@ public class LngPricePurPngAppSuDtlVo {
     * 基础量/增量(基础量/增量1/增量2)
     */
     @ApiModelProperty("基础量/增量(基础量/增量1/增量2)")
-    @Trans(type = TransType.DIC, id = "2007987645607911425", transToFieldName = "priceTypeName")
+    @Trans(type = TransType.DIC, id = "2007987645607911425", transToFieldName = "priceName")
     private String priceCode;
     private String priceName;
 

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPriceSalesPngAppCuDtlVo.java

@@ -41,7 +41,7 @@ public class LngPriceSalesPngAppCuDtlVo {
     * 基础量/增量(基础量/增量1/增量2)
     */
     @ApiModelProperty("基础量/增量(基础量/增量1/增量2)")
-    @Trans(type = TransType.DIC, id = "2007987645607911425", transToFieldName = "priceTypeName")
+    @Trans(type = TransType.DIC, id = "2007987645607911425", transToFieldName = "priceName")
     private String priceCode;
     private String priceName;
     

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/controller/PricePurPngAppController.java

@@ -97,7 +97,7 @@ public class PricePurPngAppController {
 
             @Override
             public UpdateLngPricePurPngAppDto after(DataOperationContent<UpdateLngPricePurPngAppDto> content) {
-                execAfter(content.getTableName(), content.getIdValue(), "I");
+                execAfter("lng_price_pur_png", content.getIdValue(), "I");
                 return content.getObj();
             }
         });
@@ -130,7 +130,7 @@ public class PricePurPngAppController {
 
             @Override
             public UpdateLngPricePurPngAppDto after(DataOperationContent<UpdateLngPricePurPngAppDto> content) {
-                execAfter(content.getTableName(), content.getIdValue(), "U");
+                execAfter("lng_price_pur_png", content.getIdValue(), "U");
                 return content.getObj();
             }
         }));
@@ -140,7 +140,17 @@ public class PricePurPngAppController {
     @ApiOperation(value = "删除")
     @SaCheckPermission("pricePurPngApp:delete")
     public R delete(@Valid @RequestBody List<Long> ids){
-        return R.ok(dataService.deleteByIds(UpdateLngPricePurPngAppDto.class, ids));
+        return R.ok(dataService.deleteByIds(UpdateLngPricePurPngAppDto.class, ids, new DataOperationListener<UpdateLngPricePurPngAppDto>() {
+            @Override
+            public UpdateLngPricePurPngAppDto before(DataOperationContent<UpdateLngPricePurPngAppDto> content) {
+                return null;
+            }
+
+            @Override
+            public UpdateLngPricePurPngAppDto after(DataOperationContent<UpdateLngPricePurPngAppDto> content) {
+                return null;
+            }
+        }));
     }
     
 

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/controller/PriceSalesPngAppController.java

@@ -97,7 +97,7 @@ public class PriceSalesPngAppController {
 
             @Override
             public UpdateLngPriceSalesPngAppDto after(DataOperationContent<UpdateLngPriceSalesPngAppDto> content) {
-                execAfter(content.getTableName(), content.getIdValue(), "I");
+                execAfter("lng_price_sales_png", content.getIdValue(), "I");
                 return content.getObj();
             }
         });
@@ -130,7 +130,7 @@ public class PriceSalesPngAppController {
 
             @Override
             public UpdateLngPriceSalesPngAppDto after(DataOperationContent<UpdateLngPriceSalesPngAppDto> content) {
-                execAfter(content.getTableName(), content.getIdValue(), "U");
+                execAfter("lng_price_sales_png", content.getIdValue(), "U");
                 return content.getObj();
             }
         }));
@@ -140,7 +140,17 @@ public class PriceSalesPngAppController {
     @ApiOperation(value = "删除")
     @SaCheckPermission("priceSalesPngApp:delete")
     public R delete(@Valid @RequestBody List<Long> ids){
-        return R.ok(dataService.deleteByIds(UpdateLngPriceSalesPngAppDto.class, ids));
+        return R.ok(dataService.deleteByIds(UpdateLngPriceSalesPngAppDto.class, ids, new DataOperationListener<UpdateLngPriceSalesPngAppDto>() {
+            @Override
+            public UpdateLngPriceSalesPngAppDto before(DataOperationContent<UpdateLngPriceSalesPngAppDto> content) {
+                return null;
+            }
+
+            @Override
+            public UpdateLngPriceSalesPngAppDto after(DataOperationContent<UpdateLngPriceSalesPngAppDto> content) {
+                return null;
+            }
+        }));
     }
     
 

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/mapper/LngPricePurPngAppSuMapper.java

@@ -22,7 +22,7 @@ public interface LngPricePurPngAppSuMapper extends MPJBaseMapper<LngPricePurPngA
     @Select("SELECT t1.*, t2.k_name AS kName, t3.su_sname AS suName, t7.name as uomName," +
             "       t4.full_name AS pointUpName, t5.full_name AS pointDelyName" +
             "  FROM lng_price_pur_png_app_su t1" +
-            "  LEFT JOIN lng_contract t2 ON t1.id = t1.k_id" +
+            "  LEFT JOIN lng_contract t2 ON t2.id = t1.k_id" +
             "  LEFT JOIN lng_supplier t3 ON t3.su_code = t1.su_code" +
             "  LEFT JOIN lng_b_station_png t4 ON t4.code = t1.point_up_code" +
             "  LEFT JOIN lng_b_station_png t5 ON t5.code = t1.point_dely_code" +

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/mapper/LngPriceSalesPngAppCuMapper.java

@@ -22,7 +22,7 @@ public interface LngPriceSalesPngAppCuMapper extends MPJBaseMapper<LngPriceSales
     @Select("SELECT t1.*, t2.k_name AS kName, t3.cu_sname AS cuName, t7.name as uomName," +
             "       t5.full_name AS pointDelyName" +
             "  FROM lng_price_sales_png_app_cu t1" +
-            "  LEFT JOIN lng_contract t2 ON t1.id = t1.k_id" +
+            "  LEFT JOIN lng_contract t2 ON t2.id = t1.k_id" +
             "  LEFT JOIN lng_customer t3 ON t3.cu_code = t1.cu_code" +
             "  LEFT JOIN lng_b_station_png t5 ON t5.code = t1.point_dely_code" +
             "  LEFT JOIN xjr_dictionary_item t6 ON t6.code = 'LNG_UOM'" +