update

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerPageVo.java

@@ -76,7 +76,7 @@ public class LngCustomerPageVo {
     */
     @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)")
     //@Trans(type = TransType.DIC, id = "1990669393069129729", transToFieldName = "approName")
-    @Trans(type = TransType.DIC, id = "1990669393069129729")
+    @Trans(type = TransType.DIC, id = "1990669393069129729", transToFieldName = "approName")
     private String approCode;
     
     @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)")

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScorePageVo.java

@@ -59,12 +59,16 @@ public class LngScorePageVo {
     */
     @ApiModelProperty("分数")
     private BigDecimal score;
+    
     /**
-    * 审批状态(未审批/审批中/已审批/已驳回)
+     * 状态(未提交/审批中/已审批/已驳回)
-    */
+     */
-    @ApiModelProperty("审批状态(未审批/审批中/已审批/已驳回)")
+     @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)")
-    @Trans(type = TransType.DIC, id = "1990669393069129729")
+     @Trans(type = TransType.DIC, id = "1990669393069129729", transToFieldName = "approName")
-    private String approCode;
+     private String approCode;
+     
+     @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)")
+     private String approName;
     /**
     * 备注
     */

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScorePageVo.java

@@ -59,12 +59,16 @@ public class LngScorePageVo {
     */
     @ApiModelProperty("分数")
     private BigDecimal score;
+    
     /**
-    * 审批状态(未审批/审批中/已审批/已驳回)
+     * 状态(未提交/审批中/已审批/已驳回)
-    */
+     */
-    @ApiModelProperty("审批状态(未审批/审批中/已审批/已驳回)")
+     @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)")
-    @Trans(type = TransType.DIC, id = "1990669393069129729")
+     @Trans(type = TransType.DIC, id = "1990669393069129729", transToFieldName = "approName")
-    private String approCode;
+     private String approCode;
+     
+     @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)")
+     private String approName;
     /**
     * 备注
     */

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractPurPngController.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;
@@ -24,12 +26,10 @@ import com.xjrsoft.module.contract.dto.UpdateLngContractPurDto;
 import com.xjrsoft.module.contract.entity.LngContractPur;
 import com.xjrsoft.module.contract.service.IContractPurPngService;
 import com.xjrsoft.module.contract.vo.LngContractPurPageVo;
-import com.xjrsoft.module.contract.vo.LngContractPurVo;
 import com.xjrsoft.module.datalog.service.DatalogService;
 import com.xjrsoft.module.datalog.vo.DataChangeLogVo;
 
 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;
@@ -97,15 +97,39 @@ public class ContractPurPngController {
     @ApiOperation(value = "新增LngContract")
     @SaCheckPermission("contractPurPng:add")
     public R add(@Valid @RequestBody UpdateLngContractPurDto dto){
-        UpdateLngContractPurDto res = dataService.insert(dto);
+        //UpdateLngContractPurDto res = dataService.insert(dto);
-        return R.ok(res.getId());
+      	UpdateLngContractPurDto res = dataService.insert(dto, new DataOperationListener<UpdateLngContractPurDto>() {
+	            @Override
+	            public UpdateLngContractPurDto before(DataOperationContent<UpdateLngContractPurDto> content) {
+	                return null;
+	            }
+	
+	            @Override
+	            public UpdateLngContractPurDto after(DataOperationContent<UpdateLngContractPurDto> content) {
+	                return null;
+	            }
+	        });
+   
+        return R.ok(res);
     }
 
     @PutMapping
     @ApiOperation(value = "修改LngContract")
     @SaCheckPermission("contractPurPng:edit")
     public R update(@Valid @RequestBody UpdateLngContractPurDto dto){
-	    return R.ok(dataService.updateById(dto));
+	    //return R.ok(dataService.updateById(dto));
+      	UpdateLngContractPurDto res = dataService.insert(dto, new DataOperationListener<UpdateLngContractPurDto>() {
+            @Override
+            public UpdateLngContractPurDto before(DataOperationContent<UpdateLngContractPurDto> content) {
+                return null;
+            }
+
+            @Override
+            public UpdateLngContractPurDto after(DataOperationContent<UpdateLngContractPurDto> content) {
+                return null;
+            }
+        });
+      	return R.ok(res);
     }
 
     @DeleteMapping