维保单位接口修改

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/MaintenanceCompany.java

@@ -77,11 +77,7 @@ public class MaintenanceCompany extends BaseEntity {
 	@TableField("instance_id")
     private Long instanceId;
 	
-	//@Transient
 	@ApiModelProperty(value = "动态表单值")
 	@TableField(exist = false)
 	private List<DynamicFormInstance> dynamicFormValue;
-	
-	
-	
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/DynamicFormInstanceMapper.xml

@@ -35,6 +35,7 @@
         cb_dynamic_form_instance i
         where i.GROUP_CODE = #{groupCode}
         and i.APP_KEY = #{appKey}
+        and i.is_delete = 0
         GROUP by
         i.INSTANCE_ID)d
         <if test="params != null and  params.size() > 0">
@@ -80,9 +81,14 @@
         <if test="appKey != null and appKey !=''">
             and i.APP_KEY = #{appKey}
         </if>
+        <foreach collection="params" index="key" item="value" separator="">
+            <if test="key != null and key = 'instanceIds' ">
+                and find_in_set(i.instance_id, #{value}) > 0
+            </if>
+        </foreach>
         GROUP by
         i.INSTANCE_ID) d
-        <if test="params != null and  params.size() > 0">
+        <if test="params != null and params.size() > 0">
             where
             1=1
             <foreach collection="params" index="key" item="value" separator="">

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/ContractController.java

@@ -115,11 +115,13 @@ public class ContractController extends BaseController {
     @GetMapping(value = "/page")
     @ApiOperation(httpMethod = "GET", value = "维保合同分页查询", notes = "维保合同分页查询")
     public ResponseModel<Page<ContractDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
-            (value = "size") int size, Long companyId, String name, Long typeCode, Date signedDate) {
+            (value = "size") int size, Long companyId, Long signedCompanyId, String name, Long typeCode,
+                                                         Date signedDate) {
         Page<ContractDto> page = new Page<ContractDto>();
         page.setCurrent(current);
         page.setSize(size);
-        return ResponseHelper.buildResponse(contractServiceImpl.queryForContractPage(page, false, companyId, name,
+        return ResponseHelper.buildResponse(contractServiceImpl.queryForContractPage(page, false, companyId,
+                signedCompanyId, name,
                 typeCode, signedDate));
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/ContractServiceImpl.java

@@ -47,10 +47,11 @@ public class ContractServiceImpl extends BaseService<ContractDto, Contract, Cont
      */
     public Page<ContractDto> queryForContractPage(Page<ContractDto> page, Boolean isDelete,
                                                   @Condition(Operator.eq) Long companyId,
+                                                  @Condition(Operator.eq) Long signedCompanyId,
                                                   @Condition(Operator.like) String name,
                                                   @Condition(Operator.eq) Long typeCode,
                                                   @Condition(Operator.likeLeft) Date signedDate) {
-        return this.queryForPage(page, null, false, isDelete, companyId, name, typeCode, signedDate);
+        return this.queryForPage(page, null, false, isDelete, companyId, signedCompanyId, name, typeCode, signedDate);
     }
 
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DynamicFormInstanceServiceImpl.java

@@ -160,3 +160,4 @@ public class DynamicFormInstanceServiceImpl extends BaseService<DynamicFormInsta
         return params;
     }
 }
+

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/MaintenanceCompanyServiceImpl.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.module.common.api.dto.MaintenanceCompanyDto;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
@@ -312,11 +314,13 @@ public class MaintenanceCompanyServiceImpl
 		switch (maintenanceType) {
 		case PERSON:
 			type = MAINTENANCE_PERSON;
+			filedParamsMap = new HashMap<>();
 			if (paramsMap.containsKey("status")) {
-				filedParamsMap = new HashMap<String, String>();
 				filedParamsMap.put("status", paramsMap.get("status").toString());
 			}
 			mainTableList = this.checkMaintenanceCompanyList(wrapper, paramsMap);
+			List<Long> instanceIds = Lists.transform(mainTableList, MaintenanceCompany::getInstanceId);
+			filedParamsMap.put("instanceIds", Joiner.on(",").join(instanceIds));
 			break;
 		case COMPANY:
 			type = MAINTENANCE_COMPANY;
@@ -351,7 +355,7 @@ public class MaintenanceCompanyServiceImpl
 	public List<MaintenanceCompany> checkMaintenanceCompanyList(LambdaQueryWrapper<MaintenanceCompany> wrapper,
 																Map<String, Object> paramsMap) {
 		if (paramsMap.containsKey("name")) {
-			wrapper.likeRight(MaintenanceCompany::getName, paramsMap.get("name").toString());
+			wrapper.like(MaintenanceCompany::getName, paramsMap.get("name").toString());
 		}
 		if (paramsMap.containsKey("parentId") && !"-1".equals(paramsMap.get("parentId"))) {
 			wrapper.eq(MaintenanceCompany::getParentId, Long.parseLong(paramsMap.get("parentId").toString()));