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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeRegistrationUnitDto.java

@@ -151,4 +151,7 @@ public class JgChangeRegistrationUnitDto extends BaseDto {
 
     @ApiModelProperty(value = "其他附件")
     private String otherAccessories;
+
+    @ApiModelProperty(value = "公司类型")
+    private String companyType;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgUseRegistrationDto.java

@@ -109,4 +109,7 @@ public class JgUseRegistrationDto extends BaseDto {
 
     @ApiModelProperty(value = "其他附件")
     private String otherAccessories;
+
+    @ApiModelProperty(value = "车牌号（仅限厂车）")
+    private String licensePlateNum;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/UseFlagParamDto.java

+package com.yeejoin.amos.boot.module.jg.api.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author Administrator
+ * 使用标志参数
+ */
+@Data
+public class UseFlagParamDto {
+
+    /**
+     * 设备种类名称
+     */
+    private String equList;
+
+    /**
+     * 设备种类编码
+     */
+    private String equListCode;
+
+    /**
+     * 设备代码
+     */
+    private String equipCode;
+
+    /**
+     * 设备品种名称
+     */
+    private String equipDefine;
+
+    /**
+     * 使用单位名称
+     */
+    private String useUnitName;
+
+    /**
+     * 设备类别名称
+     */
+    private String equipCategory;
+
+    /**
+     * 单位内编号
+     */
+    private String useInnerCode;
+
+    /**
+     * 登记机关
+     */
+    private String receiveOrgName;
+
+    /**
+     * 检验机构名称
+     */
+    private String inspectionUnitName;
+
+    /**
+     * 登记证编号
+     */
+    private String useRegistrationCode;
+
+    /**
+     * 下次检验日期
+     */
+    private Date nextInspectionDate;
+
+
+    /**
+     * 维保单位名称--电梯专用
+     */
+    private String maintenanceUnitName;
+
+    /**
+     * 应急救援电话--电梯专用
+     */
+    private String emergencyTel;
+
+
+    /**
+     * 车牌号--车用气瓶专用
+     */
+    private String carNumber;
+
+    /**
+     * 产品编号--车用气瓶专用
+     *
+     */
+
+    private String  factoryNumber;
+
+    /**
+     * 气瓶数量或者容积--车用气瓶专用
+     */
+    private String cylinderNumOrVolume;
+
+    /**
+     * 申请编号
+     */
+    private String applyNo;
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgUseRegistration.java

@@ -199,4 +199,10 @@ public class JgUseRegistration extends BaseEntity {
      */
     @TableField(value = "other_accessories")
     private String otherAccessories;
+
+    /**
+     * 车牌号（仅限厂车）
+     */
+    @TableField(value = "license_plate_num")
+    private String licensePlateNum;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/CommonMapper.java

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
 
@@ -31,5 +30,7 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
     String selectBusinessData(String tableName, String instanceId);
 
     void updateBusinessData(String tableName,String assignee, String transferToUserIds, String instanceId,String nextTaskId);
+
+    Map<String, Object> getUserPhone(String name ,String companyCode);
 }
 

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

@@ -78,7 +78,16 @@
     update ${tableName}
     set transfer_to_user_ids  = #{transferToUserIds},
         next_execute_user_ids = #{assignee},
-        next_task_id = #{nextTaskId}
+        next_task_id          = #{nextTaskId}
     where instance_id = #{instanceId}
-    </update>
+</update>
+
+    <select id="getUserPhone" resultType="java.util.Map">
+        SELECT phone
+        FROM "tzs_user_info"
+        WHERE unit_code = #{companyCode}
+          and name = #{name}
+          AND is_delete = 0
+    </select>
+
 </mapper>

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

@@ -360,5 +360,17 @@ public class CommonController extends BaseController {
         return ResponseHelper.buildResponse(result);
     }
 
+    /**
+     * 查询当前登录用户公司下的管理员对应联系方式
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getUserPhone")
+    @ApiOperation(httpMethod = "GET", value = "查询当前登录用户公司下的管理员对应联系方式", notes = "查询当前登录用户公司下的管理员对应联系方式，证件编号")
+    public ResponseModel<Map<String, Object>> getUserPhone(@RequestParam(value = "name") String name) {
+        return ResponseHelper.buildResponse(commonService.getUserPhone(name));
+    }
+
 
 }

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

@@ -49,7 +49,11 @@ public class JgUseRegistrationController extends BaseController {
     @PostMapping(value = "/flowExecute")
     @ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
     public ResponseModel<Object> flowExecute(@RequestBody JSONObject map) {
-        jgUseRegistrationServiceImpl.flowExecute(Long.valueOf(String.valueOf(map.get("sequenceNbr"))), String.valueOf(map.get("instanceId")), String.valueOf(map.get("operate")), String.valueOf(map.get("comment")));
+        jgUseRegistrationServiceImpl.flowExecute(Long.valueOf(String.valueOf(map.get("sequenceNbr"))),
+                String.valueOf(map.get("instanceId")),
+                String.valueOf(map.get("operate")),
+                String.valueOf(map.get("comment")),
+                String.valueOf(map.get("licensePlateNum")));
         return ResponseHelper.buildResponse("ok");
     }
 
@@ -95,7 +99,9 @@ public class JgUseRegistrationController extends BaseController {
         } else {
             dto.setDataType(BaseController.COMPANY_TYPE_SUPERVISION);
         }
-        return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.getList(dto, page, dto.getRoleIds()));
+        Page<Map<String, Object>> list = jgUseRegistrationServiceImpl.getList(dto, page, dto.getRoleIds());
+        list.getRecords().forEach(x-> x.put("companyType",info.getCompany().getCompanyType()));
+        return ResponseHelper.buildResponse(list);
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service;
 
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.jg.api.dto.UseFlagParamDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
 
 import javax.servlet.http.HttpServletResponse;
@@ -23,19 +24,20 @@ public interface ICommonService {
     List<LinkedHashMap> getRegion(String level, String parentId);
 
     List<LinkedHashMap> getTree(ReginParams selectedOrgInfo);
+
     List<LinkedHashMap> getApproveTree(ReginParams reginParams);
 
     List<LinkedHashMap> creatTree();
 
-    List<Map<String,Object>> getUnitListByType(String type);
+    List<Map<String, Object>> getUnitListByType(String type);
 
     List<Map<String, Object>> getSecurityAdmin(String type, String useUnitCode);
 
-    Map<String,Object> getUserInfo(String sequenceNbr);
+    Map<String, Object> getUserInfo(String sequenceNbr);
 
-    Map<String,Object> getEnterpriseInfo(String sequenceNbr);
+    Map<String, Object> getEnterpriseInfo(String sequenceNbr);
 
-    List<Map<String,Object>> getEnterpriseEmployee(String unitCode);
+    List<Map<String, Object>> getEnterpriseEmployee(String unitCode);
 
     void generateCertificateReport(Map<String, Object> map, HttpServletResponse response);
 
@@ -43,7 +45,7 @@ public interface ICommonService {
 
     List<LinkedHashMap> creatApproveTree();
 
-    List<Map<String, Object>>  superviseBusinessCategory(String type);
+    List<Map<String, Object>> superviseBusinessCategory(String type);
 
     Object invokeBusinessProcess(String submitType, Map<String, Object> obj, ReginParams reginParams);
 
@@ -59,8 +61,9 @@ public interface ICommonService {
 
     /**
      * 接收机构树
-     * @return  List<Map>
+     *
      * @param bizType 业务类型： notice-告知类， register-登记类
+     * @return List<Map>
      */
     List<LinkedHashMap> getReceiveUnitTree(String bizType);
 
@@ -68,4 +71,13 @@ public interface ICommonService {
 
 
     Map<String, Object> getPermissionTreeWithCompany(String menuAgent, String permissionType, String path, CompanyBo company);
+
+    /**
+     * 使用标志生成
+     * @param  useFlagParamDto 参数
+     * @param response 文件信息
+     */
+    void useFlagGenerate(UseFlagParamDto useFlagParamDto, HttpServletResponse response);
+
+    Map<String, Object> getUserPhone(String name);
 }

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/JgChangeRegistrationTransferServiceImpl.java

@@ -628,7 +628,9 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
     public Page<Map<String, Object>> queryListForPage(Page<Map<String, Object>> page, JgChangeRegistrationTransferDto params, String type) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         String currentUserId = reginParams.getUserModel().getUserId();
+        String companyType = reginParams.getCompany().getCompanyType();
         Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, params, params.getRoleIds(), type, currentUserId);
+        listPage.getRecords().forEach(x-> x.put("companyType",companyType));
         return listPage;
     }
 

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/JgChangeRegistrationUnitServiceImpl.java

@@ -319,6 +319,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
 
         String orgCode;
         orgCode = reginParams.getCompany().getCompanyCode();
+        String companyType = reginParams.getCompany().getCompanyType();
         String currentUserId = reginParams.getUserModel().getUserId();
         Page<JgChangeRegistrationUnit> noticePage = JgChangeRegistrationUnitMapper.queryForPage(page, model, type, orgCode, model.getRoleIds(),currentUserId);
 
@@ -327,6 +328,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         List<JgChangeRegistrationUnitDto> records = noticePage.getRecords().stream().map(notice -> {
             JgChangeRegistrationUnitDto noticeDto = new JgChangeRegistrationUnitDto();
             BeanUtils.copyProperties(notice, noticeDto);
+            noticeDto.setCompanyType(companyType);
             return noticeDto;
         }).collect(java.util.stream.Collectors.toList());
         noticeDtoPage.setRecords(records);

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/JgUseRegistrationServiceImpl.java

@@ -396,14 +396,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 List<WorkflowResultDto> resultDto = commonServiceImpl.buildWorkFlowInfo(processTaskDTOS);
                 if (!ObjectUtils.isEmpty(resultDto) && !ObjectUtils.isEmpty(resultDto.get(0))) {
                     WorkflowResultDto workflowResultDto = resultDto.get(0);
-                    updateData(jgUseRegistration.getSequenceNbr(), "0", workflowResultDto, Boolean.TRUE);
+                    updateData(jgUseRegistration.getSequenceNbr(), "0", workflowResultDto, Boolean.TRUE,"");
                 }
 
             }
 
             if (!ObjectUtils.isEmpty(instanceId)) {
                 // 执行流程
-                flowExecute(jgUseRegistration.getSequenceNbr(), instanceId, "0", "");
+                flowExecute(jgUseRegistration.getSequenceNbr(), instanceId, "0", "","");
             }
         } else {
             ArrayList<TaskModelDto> list = new ArrayList<>();
@@ -428,7 +428,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         return this.baseMapper.getDetailById(jgUseRegistration.getSequenceNbr());
     }
 
-    public JgUseRegistration updateData(Long sequenceNbr, String operate, WorkflowResultDto workflowResultDto, Boolean isFirst) {
+    public JgUseRegistration updateData(Long sequenceNbr, String operate, WorkflowResultDto workflowResultDto, Boolean isFirst,String licensePlateNum) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         String role = workflowResultDto.getNextExecutorRoleIds();
         String taskCode = FlowStatusEnum.TO_BE_FINISHED.getName();
@@ -436,6 +436,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             taskCode = workflowResultDto.getNextTaskCode();
         }
         JgUseRegistration jgUseRegistration = this.getBaseMapper().selectById(sequenceNbr);
+        jgUseRegistration.setLicensePlateNum(licensePlateNum);
         LambdaQueryWrapper<JgUseRegistrationEq> eq = new QueryWrapper<JgUseRegistrationEq>().lambda().eq(JgUseRegistrationEq::getEquipTransferId, sequenceNbr);
         JgUseRegistrationEq jgUseRegistrationEq = jgRelationEquipMapper.selectOne(eq);
         jgUseRegistration.setEquipId(jgUseRegistrationEq.getEquId());
@@ -521,6 +522,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 String code = commonServiceImpl.generateRegistrationCode(jgUseRegistration.getSupervisoryCode(), jgUseRegistration.getReceiveCompanyCode());
                 jgUseRegistration.setUseRegistrationCode(code);
                 jgUseRegistration.setAuditPassDate(new Date());
+                registerInfo.setUseOrgCode(code);
+                LambdaUpdateWrapper<IdxBizJgRegisterInfo> lambda = new UpdateWrapper<IdxBizJgRegisterInfo>().lambda();
+                lambda.eq(IdxBizJgRegisterInfo::getRecord, registerInfo.getRecord());
+                lambda.set(true, IdxBizJgRegisterInfo::getUseOrgCode, code);
+                idxBizJgRegisterInfoService.update(lambda);
             }
             // 使用信息
             LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
@@ -606,7 +612,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     }
 
 
-    public void flowExecute(Long id, String instanceId, String operate, String comment) {
+    public void flowExecute(Long id, String instanceId, String operate, String comment,String licensePlateNum) {
         JgUseRegistration jgUseRegistration = this.getBaseMapper().selectById(id);
         // 组装信息
         TaskResultDTO dto = new TaskResultDTO();
@@ -632,7 +638,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         List<WorkflowResultDto> resultDto = commonServiceImpl.buildWorkFlowInfo(processTaskDTOS);
         if (!ObjectUtils.isEmpty(resultDto) && !ObjectUtils.isEmpty(resultDto.get(0))) {
             WorkflowResultDto workflowResultDto = resultDto.get(0);
-            updateData(jgUseRegistration.getSequenceNbr(), operate, workflowResultDto, Boolean.FALSE);
+            updateData(jgUseRegistration.getSequenceNbr(), operate, workflowResultDto, Boolean.FALSE,licensePlateNum);
         }
     }
 
@@ -704,20 +710,28 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jsonObject.put("applyNo", jgUseRegistration.getApplyNo());
             jsonObject.remove("submit");
             jsonObject.remove("instanceId");
+
+            // 补充"车牌号"字段
+            JgUseRegistration jgUseRegistration1 = this.getBaseMapper().selectById(sequenceNbr);
+            jsonObject.put("licensePlateNum", jgUseRegistration1.getLicensePlateNum());
             return jsonObject;
         }
+        // 基本信息 + 制造信息
         Map<String, Object> detail = this.baseMapper.getDetail(id);
+        // 检验信息
         Map<String, Object> inspectDetail = this.baseMapper.getInspectDetail(id);
+        // 使用信息
         Map<String, Object> useDetail = this.baseMapper.getUseDetail(id);
-        Map<String, Object> useDestail = this.baseMapper.getDesDetail(id);
+        // 设计信息
+        Map<String, Object> degDestail = this.baseMapper.getDesDetail(id);
         if (!ObjectUtils.isEmpty(inspectDetail)) {
             detail.putAll(inspectDetail);
         }
         if (!ObjectUtils.isEmpty(useDetail)) {
             detail.putAll(useDetail);
         }
-        if (!ObjectUtils.isEmpty(useDestail)) {
-            detail.putAll(useDestail);
+        if (!ObjectUtils.isEmpty(degDestail)) {
+            detail.putAll(degDestail);
         }
         detail.remove("safetyManager");
         detail.put("proDuctPhoto", JSON.parse(String.valueOf(detail.get("proDuctPhoto"))));

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/TzsUserInfo.java

@@ -105,6 +105,13 @@ public class TzsUserInfo extends BaseEntity {
      */
     @TableField("unit_name")
     private String unitName;
+
+    /**
+     * 企业编码
+     */
+    @TableField("unit_code")
+    private String unitCode;
+
     /**
      * 头像
      */

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgSupervisionInfoMapper.java

 package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgSupervisionInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgSupervisionInfo;
 
 /**
  * 监督管理信息表 Mapper 接口