20220915

合同管理-合同登记

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/mould/service/SerialnumTplService.java

@@ -83,7 +83,7 @@ public class SerialnumTplService {
             SysSerialnumTpl numTpl = this.querySerialTpl(office, bizCode);
             if (numTpl == null) {
                 //查询编号模板   {brspnm}DZ-{year}-{serialNum}
-                SysSerialnumTpl serialNumTpl = serialnumTplMapper.queryByComAndBizCode("0", bizCode);
+                SysSerialnumTpl serialNumTpl = serialnumTplMapper.queryByComAndBizCode(companyId, bizCode);
                 serialNumTpl.setCompanyId(companyId);
                 serialNumTpl.setSerialNum(0);
                 serialNumTpl.setCreateBy(dto.getId());

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/domain/WorkContractInfo.java

@@ -16,6 +16,11 @@ public class WorkContractInfo extends BaseEntity {
     private String clientId;
 
     /**
+     * 客户名称
+     */
+    private String clientName;
+
+    /**
      * 合同编号
      */
     private String no;
@@ -109,10 +114,15 @@ public class WorkContractInfo extends BaseEntity {
     private String filedRemarks;
 
     /**
+     * 流程id
+     */
+    private String procInsId;
+
+    /**
      * 状态
      */
     @Query
-    private String procInsId;
+    private String status;
 
     /**
      * 归档状态
@@ -125,12 +135,6 @@ public class WorkContractInfo extends BaseEntity {
      */
     private String borrowType;
 
-    /**
-     * 客户名称
-     */
-    @TableField(exist = false)
-    private String clientName;
-
     @TableField(exist = false)
     private String[] contractDates;
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/mapper/xml/WorkContractInfoMapper.xml

@@ -11,6 +11,7 @@
 			a.update_date,
 			a.del_flag,
 			a.client_id,
+			a.client_name,
 			a.`no`,
 			a.`name`,
 			a.contract_date,
@@ -30,6 +31,7 @@
 			a.confirm_filed_no,
 			a.filed_remarks,
 			a.proc_ins_id,
+			a.status,
 			a.filed_type,
 			a.borrow_type
 		FROM
@@ -43,6 +45,7 @@
 		SELECT
 			id,
 			client_id,
+			client_name,
 			`no`,
 			`name`,
 			contract_date,

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/service/WorkContractService.java

@@ -37,9 +37,6 @@ public class WorkContractService {
     private WorkContractInfoMapper workContractInfoMapper;
 
     @Resource
-    private WorkClientService workClientService;
-
-    @Resource
     private OssServiceMapper ossServiceMapper;
 
     @Resource
@@ -72,18 +69,6 @@ public class WorkContractService {
             }
         }
         IPage<WorkContractInfo> pageList = workContractInfoMapper.findPageList(page, queryWrapper);
-        List<WorkContractInfo> records = pageList.getRecords();
-        if (CollectionUtils.isNotEmpty(records)) {
-            records.stream().forEach(dto -> {
-                // 查询客户信息
-                if (StringUtils.isNotEmpty(dto.getClientId())) {
-                    String s = TicketQueryUtils.enterpriseTicketInfoQueryById(dto.getClientId());
-                    JSONObject jsonObject = JSONObject.fromObject(s);
-                    dto.setClientName(jsonObject.getString("ENTNAME"));
-                }
-            });
-            pageList.setRecords(records);
-        }
         return pageList;
     }
 
@@ -166,12 +151,6 @@ public class WorkContractService {
         WorkContractInfoDto dto = new WorkContractInfoDto();
         WorkContractInfo info = workContractInfoMapper.findById(id);
         BeanUtils.copyProperties(info, dto);
-        // 查询客户信息
-        if (StringUtils.isNotEmpty(dto.getClientId())) {
-            String s = TicketQueryUtils.enterpriseTicketInfoQueryById(dto.getClientId());
-            JSONObject jsonObject = JSONObject.fromObject(s);
-            dto.setClientName(jsonObject.getString("ENTNAME"));
-        }
         // 查询附件信息
         LambdaQueryWrapper<WorkAttachment> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(WorkAttachment::getAttachmentId, id);