Merge remote-tracking branch 'origin/dev' into dev

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractFactDto.java

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.contract.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -181,4 +182,10 @@ public class AddLngContractFactDto implements Serializable {
     */
     @ApiModelProperty("lngContractApproRel子表")
     private List<AddLngContractApproRelDto> lngContractApproRelList;
+
+    /**
+     * lngFileUpload
+     */
+    @ApiModelProperty("lngFileUpload子表")
+    private List<UpdateLngFileUploadDto> lngFileUploadList;
 }

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactDto.java

@@ -2,6 +2,7 @@ package com.xjrsoft.module.contract.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.pictc.annotations.datalog.*;
+import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -258,4 +259,11 @@ public class UpdateLngContractFactDto implements Serializable {
     }, 
     caseType = JoinCaseType.FULL, target = UpdateLngContractApproRelDto.class, type = JoinType.MANY)
     private List<UpdateLngContractApproRelDto> lngContractApproRelList;
+
+    /**
+     * lngFileUpload
+     */
+    @ApiModelProperty("lngFileUpload子表")
+    @LogAttrField
+    private List<UpdateLngFileUploadDto> lngFileUploadList;
 }

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

@@ -81,14 +81,25 @@ public class LngApproVo {
     @Trans(type = TransType.USER, transToFieldName = "empName")
     private Long empId;
 
+    /**
+     * 拟稿人名称
+     */
+    @ApiModelProperty("拟稿人名称")
+    private String empName;
     
     /**
     * 业务部门(xjr_department.id)
     */
     @ApiModelProperty("业务部门(xjr_department.id)")
-    @Trans(type = TransType.DEPT, transToFieldName = "eDeptName")
+    @Trans(type = TransType.DEPT, transToFieldName = "bDeptName")
     private Long bDeptId;
 
+    /**
+     * 业务部门名称
+     */
+    @ApiModelProperty("业务部门名称")
+    private String bDeptName;
+    
     
     /**
     * 公司(xjr_department.id)
@@ -97,6 +108,11 @@ public class LngApproVo {
     @Trans(type = TransType.DEPT, transToFieldName = "comName")
     private Long comId;
 
+    /**
+     * 公司名称
+     */
+    @ApiModelProperty("公司名称")
+    private String comName;
 
     /**
     * 审批状态(未提交/审批中/已审批/已驳回)

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

@@ -51,6 +51,11 @@ public class LngGradeSystemItemVo {
     @Trans(type = TransType.DEPT_BY_CODE, transToFieldName = "eDeptName")
     private String eDeptCode;
 
+    /**
+     * 评价部门编码
+     */
+    @ApiModelProperty("评价部门编码")
+    private String eDeptName;
     
     /**
     * 显示顺序

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractFactController.java

@@ -6,6 +6,15 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.api.client.util.Lists;
+import com.pictc.datalog.DataOperationContent;
+import com.pictc.datalog.DataOperationListener;
+import com.pictc.enums.BusinessCode;
+import com.pictc.enums.ExceptionCommonCode;
+import com.pictc.jdbc.JdbcTools;
+import com.pictc.jdbc.model.JdbcParam;
+import com.pictc.utils.StringUtils;
+import com.xjrsoft.common.exception.BusinessException;
 import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
@@ -42,7 +51,7 @@ public class ContractFactController {
     private final IContractFactService contractFactService;
 	private final DatalogService dataService;
 
-    @GetMapping(value = "/page")
+//    @GetMapping(value = "/page")
     @ApiOperation(value="LngContractFact列表(分页)")
     @SaCheckPermission("contractFact:list")
     public R page(@Valid LngContractFactPageDto dto){
@@ -101,7 +110,17 @@ public class ContractFactController {
     @ApiOperation(value = "新增LngContractFact")
     @SaCheckPermission("contractFact:add")
     public R add(@Valid @RequestBody UpdateLngContractFactDto dto){
-        UpdateLngContractFactDto res = dataService.insert(dto);
+        UpdateLngContractFactDto res = dataService.insert(dto, new DataOperationListener<UpdateLngContractFactDto>() {
+            @Override
+            public UpdateLngContractFactDto before(DataOperationContent<UpdateLngContractFactDto> content) {
+                return null;
+            }
+
+            @Override
+            public UpdateLngContractFactDto after(DataOperationContent<UpdateLngContractFactDto> content) {
+                return null;
+            }
+        });
         return R.ok(res.getId());
     }
 
@@ -109,15 +128,44 @@ public class ContractFactController {
     @ApiOperation(value = "修改LngContractFact")
     @SaCheckPermission("contractFact:edit")
     public R update(@Valid @RequestBody UpdateLngContractFactDto dto){
-	    return R.ok(dataService.updateById(dto));
+	    return R.ok(dataService.updateById(dto, new DataOperationListener<UpdateLngContractFactDto>() {
+            @Override
+            public UpdateLngContractFactDto before(DataOperationContent<UpdateLngContractFactDto> content) {
+                return null;
+            }
+
+            @Override
+            public UpdateLngContractFactDto after(DataOperationContent<UpdateLngContractFactDto> content) {
+                return null;
+            }
+        }));
     }
 
     @DeleteMapping
     @ApiOperation(value = "删除")
     @SaCheckPermission("contractFact:delete")
     public R delete(@Valid @RequestBody List<Long> ids){
-    return R.ok(dataService.deleteByIds(UpdateLngContractFactDto.class, ids));
+        return R.ok(dataService.deleteByIds(UpdateLngContractFactDto.class, ids, new DataOperationListener<UpdateLngContractFactDto>() {
+            @Override
+            public UpdateLngContractFactDto before(DataOperationContent<UpdateLngContractFactDto> content) {
+                String sql = StringUtils.format("{? = call pc_{0}.f_before_delete(?)}", content.getTableName());
+                List<JdbcParam> params = Lists.newArrayList();
+                JdbcParam outParam = JdbcParam.ofString(null).setOut(true);
+                params.add(outParam);
+                params.add(JdbcParam.ofLong(content.getIdValue()));
+                JdbcTools.call(sql,params);
+                String error = outParam.getStringValue();
+                if (StringUtils.isNotEmpty(error)) {
+                    throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_DELETE_EXEC_ERROR, error));
+                }
+                return content.getObj();
+            }
 
+            @Override
+            public UpdateLngContractFactDto after(DataOperationContent<UpdateLngContractFactDto> content) {
+                return null;
+            }
+        }));
     }