日计划管道气销售结算

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngDemandPurDto.java

@@ -90,21 +90,21 @@ public class UpdateLngPngDemandPurDto implements Serializable {
     /**
     * 日指定量(方)(客户填报)
     */
-    @LogField(name="日指定量(方)(客户填报)",index=9)
+    @LogField(name="日指定量",index=9)
     @ApiModelProperty("日指定量(方)(客户填报)")
     private BigDecimal qtyDemandM3;
     
     /**
     * 日批复量(吉焦)(销售批复回写)
     */
-    @LogField(name="日批复量(吉焦)(销售批复回写)",index=10)
+    @LogField(name="日批复量",index=10)
     @ApiModelProperty("日批复量(吉焦)(销售批复回写)")
     private BigDecimal qtySalesGj;
     
     /**
     * 日批复量(方)(销售批复回写)
     */
-    @LogField(name="日批复量(方)(销售批复回写)",index=11)
+    @LogField(name="日批复量",index=11)
     @ApiModelProperty("日批复量(方)(销售批复回写)")
     private BigDecimal qtySalesM3;
     
@@ -118,7 +118,7 @@ public class UpdateLngPngDemandPurDto implements Serializable {
     /**
     * 批复添加标识(Y-批复时增加的记录，N-客户填报记录；缺省N；系统字段)
     */
-    @LogField(name="批复添加标识(Y-批复时增加的记录，N-客户填报记录；缺省N；系统字段)",index=13)
+    @LogField(name="批复添加标识",index=13)
     @ApiModelProperty("批复添加标识(Y-批复时增加的记录，N-客户填报记录；缺省N；系统字段)")
     private String addSign;
     

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleHdrDto.java

@@ -5,13 +5,16 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.pictc.annotations.datalog.JoinCaseType;
 import com.pictc.annotations.datalog.JoinType;
+import com.pictc.annotations.datalog.LogAttrField;
 import com.pictc.annotations.datalog.LogField;
 import com.pictc.annotations.datalog.LogJoin;
 import com.pictc.annotations.datalog.LogJoinColumn;
 import com.pictc.annotations.datalog.LogTable;
 import com.pictc.annotations.datalog.ValueDirectionType;
+import com.xjrsoft.module.system.vo.LngFileUploadVo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -42,6 +45,7 @@ public class UpdateLngPngSettleHdrDto implements Serializable {
     */
     @LogField(name="结算月",index=1)
     @ApiModelProperty("结算月")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime settleMonth;
     
     /**
@@ -49,12 +53,14 @@ public class UpdateLngPngSettleHdrDto implements Serializable {
     */
     @LogField(name="结算月开始日期",index=2)
     @ApiModelProperty("结算月开始日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime dateFrom;
     
     /**
     * 结算月结束日期
     */
     @LogField(name="结算月结束日期",index=3)
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty("结算月结束日期")
     private LocalDateTime dateTo;
     
@@ -149,9 +155,18 @@ public class UpdateLngPngSettleHdrDto implements Serializable {
     @ApiModelProperty("lngPngSettleSales子表")
     @LogJoin(name = "lngPngSettleSales子表",
     columns = {
-    	@LogJoinColumn(field = "settleHdrId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT)
+    	@LogJoinColumn(field = "id",relatedField = "settleHdrId", valueDirection = ValueDirectionType.RIGHT)
     }, 
     caseType = JoinCaseType.FULL, target = UpdateLngPngSettleSalesDto.class, type = JoinType.MANY)
     private List<UpdateLngPngSettleSalesDto> lngPngSettleSalesList;
+    
+    
+    //附件
+    @LogAttrField
+    private List<LngFileUploadVo> lngFileUploadList;
+    
+    //对账单
+    @LogAttrField
+    private List<LngFileUploadVo> billList;
 
 }

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDtlDto.java

@@ -1,22 +1,13 @@
 package com.xjrsoft.module.dayPlan.dto;
 
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+import com.pictc.annotations.datalog.LogField;
+import com.pictc.annotations.datalog.LogTable;
+
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.List;
-
-import com.pictc.annotations.datalog.LogTable;
-import com.pictc.annotations.datalog.LogField;
-import com.pictc.annotations.datalog.LogJoin;
-import com.pictc.annotations.datalog.LogJoinColumn;
-import com.pictc.annotations.datalog.JoinCaseType;
-import com.pictc.annotations.datalog.JoinType;
-import com.pictc.annotations.datalog.ValueDirectionType;
 
 
 

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDto.java

@@ -5,6 +5,7 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.pictc.annotations.datalog.JoinCaseType;
 import com.pictc.annotations.datalog.JoinType;
 import com.pictc.annotations.datalog.LogField;
@@ -57,6 +58,7 @@ public class UpdateLngPngSettleSalesDto implements Serializable {
     */
     @LogField(name="结算月",index=3)
     @ApiModelProperty("结算月(从主表带)")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime settleMonth;
     
     /**
@@ -71,12 +73,14 @@ public class UpdateLngPngSettleSalesDto implements Serializable {
     */
     @LogField(name="计划日期",index=5)
     @ApiModelProperty("计划日期(从lng_png_sales带)")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime datePlan;
     
     /**
     * 计量日期(从lng_png_sales带)
     */
     @LogField(name="计量日期",index=6)
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty("计量日期(从lng_png_sales带)")
     private LocalDateTime dateMea;
     
@@ -205,7 +209,7 @@ public class UpdateLngPngSettleSalesDto implements Serializable {
     @ApiModelProperty("lngPngSettleSalesDtl子子表")
     @LogJoin(name = "lngPngSettleSalesDtl子子表",
     columns = {
-    	@LogJoinColumn(field = "settleId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT)
+    	@LogJoinColumn(field = "id",relatedField = "settleId", valueDirection = ValueDirectionType.RIGHT)
     }, 
     caseType = JoinCaseType.FULL, target = UpdateLngPngSettleSalesDtlDto.class, type = JoinType.MANY)
     private List<UpdateLngPngSettleSalesDtlDto> lngPngSettleSalesDtlList;

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrVo.java

@@ -182,8 +182,11 @@ public class LngPngSettleHdrVo extends com.xjrsoft.common.model.base.BaseModel{
 
 
 
-
+    //附件
     private List<LngFileUploadVo> lngFileUploadList;
+    
+    //对账单
+    private List<LngFileUploadVo> billList;
 	
  
 

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngMeasureSalesPurController.java

@@ -25,7 +25,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.pictc.datalog.DataOperationContent;
 import com.pictc.datalog.DataOperationListener;
-import com.pictc.datalog.DefaultDataOperationListener;
 import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
@@ -35,7 +34,6 @@ import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.datalog.service.DatalogService;
 import com.xjrsoft.module.datalog.vo.DataChangeLogVo;
 import com.xjrsoft.module.dayPlan.dto.LngPngMeasureSalesPurPageDto;
-import com.xjrsoft.module.dayPlan.dto.UpdateLngPngDemandDto;
 import com.xjrsoft.module.dayPlan.dto.UpdateLngPngMeasureSalesPurDto;
 import com.xjrsoft.module.dayPlan.entity.LngPngMeasureSalesPur;
 import com.xjrsoft.module.dayPlan.service.IPngMeasureSalesPurService;

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrController.java

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.pictc.datalog.DataOperationContent;
+import com.pictc.datalog.DataOperationListener;
 import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
@@ -29,7 +31,6 @@ import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrPageVo;
 import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrVo;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import io.swagger.annotations.Api;
@@ -99,22 +100,62 @@ public class PngSettleHdrController {
     @ApiOperation(value = "新增LngPngSettleHdr")
     @SaCheckPermission("pngSettleHdr:add")
     public R add(@Valid @RequestBody UpdateLngPngSettleHdrDto dto){
-        UpdateLngPngSettleHdrDto res = dataService.insert(dto);
+       
-        return R.ok(res.getId());
+    	    
+        return R.ok(dataService.insert(dto,new DataOperationListener<UpdateLngPngSettleHdrDto>() {
+	        
+		    	@Override
+		    	public UpdateLngPngSettleHdrDto before(DataOperationContent<UpdateLngPngSettleHdrDto> content) {
+		    		return null;
+		    	}
+	
+		    	@Override
+		    	public UpdateLngPngSettleHdrDto after(DataOperationContent<UpdateLngPngSettleHdrDto> content) {
+		    		
+		    		return null;
+		    	}
+		}));
+        
     }
 
     @PutMapping
     @ApiOperation(value = "修改LngPngSettleHdr")
     @SaCheckPermission("pngSettleHdr:edit")
     public R update(@Valid @RequestBody UpdateLngPngSettleHdrDto dto){
-	    return R.ok(dataService.updateById(dto));
+	   
+	    return R.ok(dataService.updateById(dto,new DataOperationListener<UpdateLngPngSettleHdrDto>() {
+	        
+		    	@Override
+		    	public UpdateLngPngSettleHdrDto before(DataOperationContent<UpdateLngPngSettleHdrDto> content) {
+		    		return null;
+		    	}
+	
+		    	@Override
+		    	public UpdateLngPngSettleHdrDto after(DataOperationContent<UpdateLngPngSettleHdrDto> content) {
+		    		
+		    		return null;
+		    	}
+		}));
     }
 
     @DeleteMapping
     @ApiOperation(value = "删除")
     @SaCheckPermission("pngSettleHdr:delete")
     public R delete(@Valid @RequestBody List<Long> ids){
-    		return R.ok(dataService.deleteByIds(UpdateLngPngSettleHdrDto.class, ids));
+    		
+    		return R.ok(dataService.deleteByIds(UpdateLngPngSettleHdrDto.class, ids,new DataOperationListener<UpdateLngPngSettleHdrDto>() {
+    	        
+		    	@Override
+		    	public UpdateLngPngSettleHdrDto before(DataOperationContent<UpdateLngPngSettleHdrDto> content) {
+		    		return null;
+		    	}
+	
+		    	@Override
+		    	public UpdateLngPngSettleHdrDto after(DataOperationContent<UpdateLngPngSettleHdrDto> content) {
+		    		
+		    		return null;
+		    	}
+		}));
 
     }