20220914

合同管理-合同登记

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/controller/WorkContractController.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jeeplus.common.utils.ResponseUtil;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.sys.utils.TicketQueryUtils;
@@ -51,15 +52,15 @@ public class WorkContractController {
      */
     @ApiOperation(value = "合同登记新增/修改")
     @PostMapping(value = "save")
-    public ResponseEntity save(@RequestBody WorkContractInfoDto workContractInfoDto) throws Exception{
+    public ResponseEntity<String> save(@RequestBody WorkContractInfoDto workContractInfoDto) throws Exception{
         if (StringUtils.isEmpty(workContractInfoDto.getId())) {
             //新增
-            workContractService.add(workContractInfoDto);
-            return ResponseEntity.ok("操作成功");
+            String id = workContractService.add(workContractInfoDto);
+            return ResponseUtil.newInstance ( ).add("businessTable", "work_contract_info").add("businessId", id).ok ("操作成功");
         }else {
             //修改
-            workContractService.update(workContractInfoDto);
-            return ResponseEntity.ok("操作成功");
+            String id = workContractService.update(workContractInfoDto);
+            return ResponseUtil.newInstance ( ).add("businessTable", "work_contract_info").add("businessId", id).ok ("操作成功");
         }
     }
 

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

@@ -112,7 +112,7 @@ public class WorkContractInfo extends BaseEntity {
      * 状态
      */
     @Query
-    private String type;
+    private String procInsId;
 
     /**
      * 归档状态

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

@@ -29,13 +29,11 @@
 			a.filed_no,
 			a.confirm_filed_no,
 			a.filed_remarks,
-			a.`type`,
+			a.proc_ins_id,
 			a.filed_type,
-			a.borrow_type,
-			b.`name` AS client_name
+			a.borrow_type
 		FROM
 			work_contract_info a
-			LEFT JOIN work_client_info b ON a.client_id = b.id
 			LEFT JOIN sys_user c ON a.create_by = c.id
 		${ew.customSqlSegment}
 		ORDER BY a.update_date DESC
@@ -63,7 +61,7 @@
 			filed_no,
 			confirm_filed_no,
 			filed_remarks,
-			type,
+			proc_ins_id,
 			filed_type,
 			borrow_type,
 			create_date,

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

@@ -72,6 +72,18 @@ 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;
     }
 
@@ -109,7 +121,7 @@ public class WorkContractService {
                 j++;
             }
         }
-        return "操作完成";
+        return id;
     }
 
     /**
@@ -132,7 +144,7 @@ public class WorkContractService {
             list.stream().forEach(i -> i.setAttachmentId(info.getId()));
             ossService.saveMsg(list);
         }
-        return "操作完成";
+        return workContractInfoDto.getId();
     }
 
     /**