维保相关功能修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/MaintenceStatusEnum.java

@@ -10,8 +10,8 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum MaintenceStatusEnum {
 
-    SUBMIT("使用单位提交", "submit", "使用单位待提交", "维保单位已驳回", "使用单位撤回"),
-    RECEIVE("维保单位审核确认", "receive", "维保单位待受理", "监管单位已驳回", "维保单位撤回"),
+    SUBMIT("使用单位提交", "submit", "使用单位待提交", "维保单位已驳回", "使用单位已撤回"),
+    RECEIVE("维保单位审核确认", "receive", "维保单位待受理", "监管单位已驳回", "维保单位已撤回"),
     PRELIMINARY("监管单位审核", "preliminary", "监管单位待受理", "", "");
 
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml

@@ -27,7 +27,7 @@
     </select>
     <select id="getUserInfo" resultType="java.util.Map">
         SELECT
-            *
+            phone
         FROM
             "tzs_user_info"
         WHERE

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgMaintenanceContractMapper.xml

@@ -128,7 +128,9 @@
         rec_date,
         create_user_id,
         create_date,
-        instance_id
+        instance_id,
+        promoter,
+        next_execute_ids
         FROM
         amos_tzs_biz.tzs_jg_maintenance_contract
         <where>
@@ -155,7 +157,7 @@
                 and receive_org_code = #{contractDto.receiveOrgCode}
             </if>
             <if test="contractDto.roleIds != null">
-                <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
+                <foreach collection='contractDto.roleIds' item='role' open='and (' close=')' separator='or'>
                     instance_status like concat('%',#{role},'%')
                 </foreach>
             </if>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java

@@ -7,7 +7,9 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import javafx.scene.chart.ValueAxis;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -85,8 +87,9 @@ public class CommonController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/getSecurityAdmin")
 	@ApiOperation(httpMethod = "GET", value = "查找当前公司下所属的安全管理员", notes = "查找当前公司下所属的安全管理员")
-	public ResponseModel<List<Map<String, Object>>> getSecurityAdmin(@RequestParam(value = "type") String type) {
-		return ResponseHelper.buildResponse(commonService.getSecurityAdmin(type));
+	public ResponseModel<List<Map<String, Object>>> getSecurityAdmin(@RequestParam(value = "type") String type,
+																	@RequestParam(value = "useUnitCode",required = false)String useUnitCode) {
+		return ResponseHelper.buildResponse(commonService.getSecurityAdmin(type,useUnitCode));
 	}
 
 
@@ -96,8 +99,8 @@ public class CommonController extends BaseController {
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/getUserInfo")
-	@ApiOperation(httpMethod = "GET", value = "查询安全管理员的基本信息", notes = "查询安全管理员的基本信息")
+	@GetMapping(value = "/getUserPhone")
+	@ApiOperation(httpMethod = "GET", value = "查询用户对应联系方式", notes = "查询用户对应联系方式")
 	public ResponseModel<Map<String,Object>> getUserInfo(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
 		return ResponseHelper.buildResponse(commonService.getUserInfo(sequenceNbr));
 	}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgMaintenanceContractController.java

@@ -208,12 +208,13 @@ public class JgMaintenanceContractController extends BaseController {
     public ResponseModel<Page<JgMaintenanceContractVo>> queryForPage(@RequestParam(value = "current") int current,
                                                                       @RequestParam(value = "size") int size,
                                                                       @RequestParam(value = "phase") int phase,
+                                                                      Map<String,Object> map,
                                                                       JgMaintenanceContractDto maintenanceContractDto) {
         Page<JgMaintenanceContract> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);
         ReginParams reginParams = getSelectedOrgInfo();
-        Page<JgMaintenanceContractVo> contractDtoPage = jgMaintenanceContractServiceImpl.queryForPage(page, phase, maintenanceContractDto, reginParams);
+        Page<JgMaintenanceContractVo> contractDtoPage = jgMaintenanceContractServiceImpl.queryForPage(page, phase, map, reginParams);
         return ResponseHelper.buildResponse(contractDtoPage);
     }
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/ICommonService.java

@@ -25,7 +25,7 @@ public interface ICommonService {
 
     List<Map<String,Object>> getUnitListByType(String type);
 
-    List<Map<String,Object>> getSecurityAdmin(String type);
+    List<Map<String, Object>> getSecurityAdmin(String type, String useUnitCode);
 
     Map<String,Object> getUserInfo(String sequenceNbr);
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java

@@ -171,10 +171,12 @@ public class CommonServiceImpl implements ICommonService {
     }
 
     @Override
-    public List<Map<String, Object>> getSecurityAdmin(String type) {
+    public List<Map<String, Object>> getSecurityAdmin(String type, String companyCode) {
+        if (ObjectUtils.isEmpty(companyCode)) {
             ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
             CompanyBo company = reginParams.getCompany();
-        String companyCode = company.getCompanyCode();
+            companyCode = company.getCompanyCode();
+        }
         String postName = null;
         if (type.equals("use")) {
             postName = "安全管理员";
@@ -185,6 +187,9 @@ public class CommonServiceImpl implements ICommonService {
         if (type.equals("agw")) {
             postName = "安改维负责人";
         }
+        if (type.equals("wbry")) {
+            postName = "维保人员";
+        }
         return ObjectUtils.isEmpty(postName) ? new ArrayList<>() : commonMapper.getSecurityAdmin(companyCode, postName);
     }
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgMaintenanceContractServiceImpl.java

@@ -41,6 +41,7 @@ import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import java.awt.print.Book;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -53,6 +54,7 @@ import java.util.stream.Collectors;
 @Service
 public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceContractDto, JgMaintenanceContract, JgMaintenanceContractMapper> implements IJgMaintenanceContractService {
 
+    public static final String SUBMIT_DATA = "0";
     public static final String SUBMIT_TYPE_FLOW = "1";
     public static final String WB_PROCESS_DEFINITION_KEY = "maintenanceFiling";
     private static final String HANDLING_STATUS_DICTIONARY = "JGGZZZ";
@@ -79,8 +81,13 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
      */
     public Page<JgMaintenanceContractVo> queryForPage(Page<JgMaintenanceContract> page,
                                                       int phase,
-                                                      JgMaintenanceContractDto dto,
+//                                                      JgMaintenanceContractDto dto,
+                                                      Map<String,Object> map,
                                                       ReginParams reginParams) {
+//        JgMaintenanceContractDto dto = new JgMaintenanceContractDto();
+//        JgMaintenanceContractDto dto = (JgMaintenanceContractDto)map;
+        JgMaintenanceContractDto dto = JSON.parseObject(JSON.toJSONString(map.get("jgMaintenanceContractDto")), JgMaintenanceContractDto.class);
+
         Page<JgMaintenanceContractDto> contractList = new Page<>();
         Page<JgMaintenanceContractVo> result = new Page<>();
         CompanyBo company = reginParams.getCompany();
@@ -374,6 +381,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
 
         // 新增编辑
         if ("add".equals(String.valueOf(map.get("pageType")))) {
+            contract.setStatus(SUBMIT_DATA.equals(submit) ? MaintenceStatusEnum.SUBMIT.getPass() : MaintenceStatusEnum.RECEIVE.getPass());
             this.save(contract);
         } else {
             this.getBaseMapper().updateById(contract);