fix(jg)：bug修改

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/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

@@ -24,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);
 
@@ -44,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);
 
@@ -60,8 +61,9 @@ public interface ICommonService {
 
     /**
      * 接收机构树
-     * @return  List<Map>
+     *
      * @param bizType 业务类型： notice-告知类， register-登记类
+     * @return List<Map>
      */
     List<LinkedHashMap> getReceiveUnitTree(String bizType);
 
@@ -76,4 +78,6 @@ public interface ICommonService {
      * @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/CommonServiceImpl.java

@@ -43,6 +43,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.RegistrationInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgSupervisionInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.RegistrationInfoMapper;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
@@ -98,9 +99,6 @@ public class CommonServiceImpl implements ICommonService {
     private RedisUtils redisUtils;
 
     @Autowired
-    CommonMapper commonMapper;
-
-    @Autowired
     IDataDictionaryService iDataDictionaryService;
 
 
@@ -144,8 +142,7 @@ public class CommonServiceImpl implements ICommonService {
     private static final String REGULATOR_UNIT = "监管机构";
     //行政审批局
     private static final String ADMINISTRATION_UNIT = "行政审批局";
-
-
+    public static final String SPECIAL_REGION_CODE = "SpecialRegionCode";
     @Value("${regulator.unit.code}")
     private String code;
 
@@ -174,65 +171,51 @@ public class CommonServiceImpl implements ICommonService {
     private static final String SBZX_PAGE_ID = "jgScrapCancelAdd";
     // 业务通用发起——更名变更表单key
     private static final String GMBG_PAGE_ID = "jgRegistrationInfo";
-
     @Autowired
-    RegistrationInfoMapper tzsJgRegistrationInfoMapper;
-
+    CommonMapper commonMapper;
     @Autowired
-    private IJgInstallationNoticeService iJgInstallationNoticeService;
-
+    RegistrationInfoMapper tzsJgRegistrationInfoMapper;
     @Autowired
     JgMaintenanceContractServiceImpl jgMaintenanceContractServiceImpl;
-
     @Autowired
     JgUseRegistrationServiceImpl jgUseRegistrationServiceImpl;
-
     @Autowired
     @Lazy
     JgEquipTransferServiceImpl jgEquipTransferServiceImpl;
-
     @Autowired
     JgReformNoticeServiceImpl jgReformNoticeService;
-
-    @Autowired
-    private IJgMaintainNoticeService iJgMaintainNoticeService;
-    @Autowired
-    private IJgTransferNoticeService jgTransferNoticeService;
-
     @Autowired
     JgChangeRegistrationReformServiceImpl jgChangeRegistrationReformServiceImpl;
-
     @Autowired
     IJgChangeRegistrationTransferService jgChangeRegistrationTransferService;
-
     @Autowired
     JgChangeRegistrationUnitServiceImpl jgChangeRegistrationUnitServiceImpl;
-
     @Autowired
     JgChangeRegistrationNameServiceImpl jgChangeRegistrationNameService;
-
     @Autowired
     JgEnableDisableServiceImpl jgEnableDisableServiceImpl;
-
     @Autowired
     JgScrapCancelServiceImpl jgScrapCancelService;
-
-
     @Autowired
     ICmWorkflowService cmWorkflowService;
-
     @Autowired
     TzsServiceFeignClient tzsServiceFeignClient;
-
     @Autowired
     DataDictionaryServiceImpl dataDictionaryService;
+    @Autowired
+    IdxBizJgSupervisionInfoMapper idxBizJgSupervisionInfoMapper;
 
-    public static final String SPECIAL_REGION_CODE = "SpecialRegionCode";
+    @Autowired
+    private IJgInstallationNoticeService iJgInstallationNoticeService;
+    @Autowired
+    private IJgMaintainNoticeService iJgMaintainNoticeService;
+    @Autowired
+    private IJgTransferNoticeService jgTransferNoticeService;
 
     public static byte[] file2byte(File file) {
         try {
             FileInputStream in = new FileInputStream(file);
-            //当文件没有结束时，每次读取一个字节显示
+            // 当文件没有结束时，每次读取一个字节显示
             byte[] data = new byte[in.available()];
             in.read(data);
             in.close();
@@ -273,7 +256,7 @@ public class CommonServiceImpl implements ICommonService {
             return ObjectUtils.isEmpty(list) ? getProvinceList(level) : list;
         } else if (!ObjectUtils.isEmpty(parentId)) {
             String regionCode = parentId.split("_")[0];
-            //regionCode不是以00结尾查询街道，以0000结果查询市、否则查询区
+            // regionCode不是以00结尾查询街道，以0000结果查询市、否则查询区
             if (!regionCode.endsWith(STREET_END_CODE)) {
                 list = ObjectUtils.isEmpty(redisUtils.get(STREET)) ? getProvinceList(STREET_LEVEL) : (List<LinkedHashMap>) redisUtils.get(STREET);
             } else if (regionCode.endsWith(END_CODE)) {
@@ -287,7 +270,6 @@ public class CommonServiceImpl implements ICommonService {
         }
     }
 
-
     public List<LinkedHashMap> getProvinceList(String level) {
         FeignClientResult result = privilegeFeginService.getProvince(level);
         List<LinkedHashMap> list = (List<LinkedHashMap>) result.getResult();
@@ -314,18 +296,17 @@ public class CommonServiceImpl implements ICommonService {
         return list;
     }
 
-
     @Override
     public List<LinkedHashMap> getCreatTree() {
         List<LinkedHashMap> result = (List<LinkedHashMap>) redisUtils.get(REGULATOR_UNIT_TREE);
-        //判断redis是否存在管辖机构树
+        // 判断redis是否存在管辖机构树
         return !ObjectUtils.isEmpty(result) ? result : creatTree();
     }
 
     @Override
     public List<LinkedHashMap> getCreatTreeByInstallation() {
         List<LinkedHashMap> result = (List<LinkedHashMap>) redisUtils.get(REGULATOR_UNIT_TREE_ALL);
-        //判断redis是否存在管辖机构树
+        // 判断redis是否存在管辖机构树
         return !ObjectUtils.isEmpty(result) ? result : getCreatTreeByInstallationTree();
     }
 
@@ -343,7 +324,7 @@ public class CommonServiceImpl implements ICommonService {
     @Override
     public List<LinkedHashMap> getReceiveUnitTree(String bizType) {
         List<LinkedHashMap> result = (List<LinkedHashMap>) redisUtils.get(genRedisKey(bizType));
-        //判断redis是否存在接收机构树
+        // 判断redis是否存在接收机构树
         return !ObjectUtils.isEmpty(result) ? result : creatReceiveUnitTree(bizType);
     }
 
@@ -432,12 +413,32 @@ public class CommonServiceImpl implements ICommonService {
         return ftlPath;
     }
 
+    /**
+     * 用户选择信心redis获取
+     **/
+    protected ReginParams getSelectedOrgInfo() {
+        return JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+    }
+
+    /**
+     * 查询当前登录用户公司下的管理员对应联系方式
+     *
+     * @param name
+     * @return
+     */
+    @Override
+    public Map<String, Object> getUserPhone(String name) {
+        ReginParams reginParams = getSelectedOrgInfo();
+        String companyCode = reginParams.getCompany().getCompanyCode();
+        return commonMapper.getUserPhone(name, companyCode);
+    }
+
     @Override
     public List<LinkedHashMap> getTree(ReginParams reginParams) {
         // 企业逻辑
         if (reginParams.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {
             List<LinkedHashMap> result = (List<LinkedHashMap>) redisUtils.get(REGULATOR_UNIT_TREE);
-            //判断redis是否存在管辖机构树
+            // 判断redis是否存在管辖机构树
             return !ObjectUtils.isEmpty(result) ? result : creatTree();
         } else {
             return Collections.singletonList((LinkedHashMap) BeanUtil.beanToMap(reginParams.getCompany()));
@@ -478,7 +479,7 @@ public class CommonServiceImpl implements ICommonService {
         // 企业逻辑
         if (reginParams.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {
             List<LinkedHashMap> result = (List<LinkedHashMap>) redisUtils.get(ADMINISTRATION_UNIT_TREE);
-            //判断redis是否存在行政审批局树
+            // 判断redis是否存在行政审批局树
             return !ObjectUtils.isEmpty(result) ? result : creatApproveTree();
         } else {
             // 监管单位逻辑
@@ -487,7 +488,6 @@ public class CommonServiceImpl implements ICommonService {
 
     }
 
-
     @Override
     public List<LinkedHashMap> creatApproveTree() {
         FeignClientResult tree = privilegeFeginService.queryAgencyTreeForCache(RequestContext.getToken(), RequestContext.getAppKey(), RequestContext.getProduct());
@@ -545,7 +545,6 @@ public class CommonServiceImpl implements ICommonService {
         return result;
     }
 
-
     private List<LinkedHashMap> deleteData(List<LinkedHashMap> result, String companyType) {
         Iterator it = result.iterator();
         while (it.hasNext()) {
@@ -561,7 +560,6 @@ public class CommonServiceImpl implements ICommonService {
         return result;
     }
 
-
     @Override
     public List<Map<String, Object>> getUnitListByType(String type) {
 
@@ -623,7 +621,7 @@ public class CommonServiceImpl implements ICommonService {
         Iterator it = result.iterator();
         while (it.hasNext()) {
             LinkedHashMap e = (LinkedHashMap) it.next();
-            //将管辖机构树中children为[]的修改为null
+            // 将管辖机构树中children为[]的修改为null
             if (e.get("children") != null) {
                 if (((List<LinkedHashMap>) e.get("children")).size() == 0) {
                     e.put("children", null);
@@ -646,7 +644,7 @@ public class CommonServiceImpl implements ICommonService {
         Iterator it = result.iterator();
         while (it.hasNext()) {
             LinkedHashMap e = (LinkedHashMap) it.next();
-            //删除使用单位
+            // 删除使用单位
             if ("company".equals(e.get("level"))) {
                 it.remove();
             }
@@ -779,7 +777,7 @@ public class CommonServiceImpl implements ICommonService {
             pdfStamper.close();
 
             // 返回文件
-            //FileExporter.exportFile(FileExporter.FileType.valueOf("pdf"), "套打使用登记证", bos.toByteArray(), response);
+            // FileExporter.exportFile(FileExporter.FileType.valueOf("pdf"), "套打使用登记证", bos.toByteArray(), response);
             this.writeAttachment(response, bos.toByteArray());
         } catch (IOException | DocumentException e) {
             e.printStackTrace();
@@ -842,7 +840,6 @@ public class CommonServiceImpl implements ICommonService {
         return urlString;
     }
 
-
     @Override
     public Object invokeBusinessProcess(String submitType, Map<String, Object> map, ReginParams reginParams) {
         Map<String, Object> basicObj = (Map<String, Object>) map.get(basic);
@@ -887,7 +884,7 @@ public class CommonServiceImpl implements ICommonService {
             }
             return jgUseRegistrationServiceImpl.save(jsonObject);
         } else if (type.equals(ApplicationFormTypeEnum.GZBG.getBusinessCode())) {
-            //兼容业务逻辑代码
+            // 兼容业务逻辑代码
             if (submitType.equals("1")) {
                 noticeObj.put("submit", "true");
             }
@@ -956,7 +953,7 @@ public class CommonServiceImpl implements ICommonService {
         flowTaskVo.setTaskId(taskId);
         flowTaskVo.setAssignee(assignee);
         ProcessTaskDTO processTaskDTO = cmWorkflowService.assign(flowTaskVo);
-        //修改待办
+        // 修改待办
         List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(instanceId).getResult();
         List<TaskV2Model> collect = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
         if (collect == null || collect.size() == 0) {
@@ -971,7 +968,7 @@ public class CommonServiceImpl implements ICommonService {
         String routhPath = taskV2Model.getRoutePath().replace("nextExecuteUserIds", "executeUserId") + "&nextExecuteUserIds=" + assignee;
         taskV2Model.setRoutePath(routhPath);
         Systemctl.taskV2Client.update(taskV2Model, taskV2Model.getSequenceNbr());
-        //创建新待办
+        // 创建新待办
         taskV2Model.setExecuteUserIds(assignee);
         String nextTaskId = processTaskDTO.getNextTask().get(0).getId();
         taskV2Model.setFlowCode(nextTaskId);
@@ -987,12 +984,11 @@ public class CommonServiceImpl implements ICommonService {
 
         String id = commonMapper.selectBusinessData(tableName, instanceId);
         id = ObjectUtils.isEmpty(id) ? assignee : id + "," + assignee;
-        //修改业务数据
+        // 修改业务数据
         commonMapper.updateBusinessData(tableName, assignee, id, instanceId, nextTaskId);
         return Boolean.TRUE;
     }
 
-
     public void deleteTaskModel(String id) {
         List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(id).getResult();
         if (result.size() > 0) {
@@ -1002,14 +998,13 @@ public class CommonServiceImpl implements ICommonService {
         }
     }
 
-
     /**
      * 待办新增接口
      **/
     public void buildTaskModel(List<TaskModelDto> list) {
         List<TaskV2Model> taskV2Models = new ArrayList<>();
         for (TaskModelDto obj : list) {
-            //判断是否是暂存 新增若无下一节点执行人即为暂存
+            // 判断是否是暂存 新增若无下一节点执行人即为暂存
             boolean flag = StringUtils.isEmpty(obj.getNextExecuteUser()) ? true : false;
             if (flag) {
                 List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(obj.getRelationId()).getResult();
@@ -1028,13 +1023,13 @@ public class CommonServiceImpl implements ICommonService {
             }
             List<Map> urlList = JsonUtils.getResourceList(urlInfo);
             for (Map map : urlList) {
-                //获取暂存的可编辑页面url
+                // 获取暂存的可编辑页面url
                 if (flag && map.get("type").equals(obj.getTaskType())
                         && map.get("pageType").equals("draft")) {
                     model.setRoutePath(map.get("url").toString() + urlParams);
                     break;
                 }
-                //维保需特殊获取页面  状态不等于监管单位审核的页面均取对应编辑页面
+                // 维保需特殊获取页面  状态不等于监管单位审核的页面均取对应编辑页面
                 else if (map.get("type").equals(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode())
                         && obj.getTaskType().equals(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode())
                         && !obj.getFlowStatus().toString().equals("16723")
@@ -1042,14 +1037,14 @@ public class CommonServiceImpl implements ICommonService {
                     model.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.getNextExecuteUser()) + urlParams + "&nextExecuteUserIds=" + model.getExecuteUserIds());
                     break;
                 }
-                //其他逻辑均按详情页面获取
+                // 其他逻辑均按详情页面获取
                 else if (map.get("type").equals(obj.getTaskType())
                         && map.get("pageType").equals(null == obj.getPageType() ? "look" : obj.getPageType())) {
                     model.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.getNextExecuteUser()) + urlParams + "&nextExecuteUserIds=" + model.getExecuteUserIds());
                     break;
                 }
             }
-            //是true则为暂存 除公共部分统一处理
+            // 是true则为暂存 除公共部分统一处理
             if (flag) {
                 model.setFlowStatus(FlowStatusEnum.TO_BE_SUBMITTED.getCode());
                 model.setFlowStatusLabel(FlowStatusEnum.TO_BE_SUBMITTED.getName());
@@ -1081,7 +1076,6 @@ public class CommonServiceImpl implements ICommonService {
         Systemctl.taskV2Client.batchAdd(taskV2Models);
     }
 
-
     /**
      * 待办编辑接口
      * 参数
@@ -1112,7 +1106,7 @@ public class CommonServiceImpl implements ICommonService {
 //        String tarUrl = url.replaceFirst("&executeUserIds=", "");
 //        tarUrl+"&executeUserIds="
         // model.setRoutePath( roleIds[0]+"roleIds="+"55555"+"&userId"+userIds[1]);
-        //当流程完成时将所有待办状态统一修改为已完成
+        // 当流程完成时将所有待办状态统一修改为已完成
         if (collect.get(0).getFlowStatusLabel().equals(FlowStatusEnum.TO_BE_FINISHED.getName())) {
             String urlParams = "";
             try {
@@ -1139,7 +1133,7 @@ public class CommonServiceImpl implements ICommonService {
             collect.get(0).setRoutePath(collect.get(0).getRoutePath().replace("roleIds=", "roleIds=55555&fq="));
             Systemctl.taskV2Client.update(collect.get(0), collect.get(0).getSequenceNbr());
         }
-        //修改model并返回 用于组装新待办
+        // 修改model并返回 用于组装新待办
         collect.get(0).setEndUserId(null);
         collect.get(0).setTaskStatus(null);
         collect.get(0).setEndDate(null);
@@ -1180,7 +1174,7 @@ public class CommonServiceImpl implements ICommonService {
         collect.get(0).setTaskStatusLabel(params.get("taskStatusLabel").toString());
         collect.get(0).setEndUserId(exeUserId);
         collect.get(0).setEndDate(new Date());
-        //当流程完成时将所有待办状态统一修改为已完成
+        // 当流程完成时将所有待办状态统一修改为已完成
         if (collect.get(0).getFlowStatusLabel().equals(FlowStatusEnum.TO_BE_FINISHED.getName())) {
             String urlParams = "";
             try {
@@ -1216,7 +1210,6 @@ public class CommonServiceImpl implements ICommonService {
         return collect.get(0);
     }
 
-
     /**
      * 待办 撤回
      *

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,6 +710,10 @@ 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);

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 接口