26854 【智信户用(管理端)】迁移工作台相关代码

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/ReviewDto.java

@@ -31,7 +31,7 @@ public class ReviewDto {
     private String planInstanceId;
     private String adminUserId;
     private String regionalCompaniesName;
-
+    private String unitInfoId;
 
 
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/AcceptanceMapper.xml

@@ -85,7 +85,9 @@
                 <if test="param.regionCompanyId!=null and param.regionCompanyId!=''">
                     and hygf_work_order.region_company_id =#{param.regionCompanyId}
                 </if>
-
+                <if test="param.peasantHouseholdId!=null and param.peasantHouseholdId!=''">
+                    and bga.peasant_household_id =#{param.peasantHouseholdId}
+                </if>
 
             </if>
         </where>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/DealerReviewMapper.xml

@@ -43,6 +43,9 @@
                 AND u.`name` like concat('%',#{name},'%')
             </if>
 
+            <if test="unitInfoId != null and unitInfoId != ''">
+                AND u.`sequence_nbr` = #{unitInfoId}
+            </if>
         </where>
         ORDER BY u.audit_status ,u.rec_date DESC
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/AcceptanceRectificationOrderServiceImpl.java

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -8,26 +9,31 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.BusinessTypeEnum;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.RectificationStatusEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceRectificationOrderDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.FileItemDto;
-import com.yeejoin.amos.boot.module.hygf.api.dto.StandardDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.WorkflowResultDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceRectificationOrder;
 import com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridAcceptance;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.AcceptanceRectificationOrderMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.BasicGridAcceptanceMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IAcceptanceRectificationOrderService;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
+import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 验收整改单服务实现类
@@ -39,12 +45,16 @@ import java.util.List;
 public class AcceptanceRectificationOrderServiceImpl extends BaseService<AcceptanceRectificationOrderDto, AcceptanceRectificationOrder, AcceptanceRectificationOrderMapper> implements IAcceptanceRectificationOrderService {
     @Autowired
     private AcceptanceRectificationOrderMapper acceptanceRectificationOrderMapper;
-//    @Value("${hygf.role.gc.roleSeq}")
+    //    @Value("${hygf.role.gc.roleSeq}")
 //    private String hygfGcRoleSeq;
     @Autowired
     private BasicGridAcceptanceMapper basicGridAcceptanceMapper;
+    //    @Autowired
+//    private WorkflowImpl workflow;
     @Autowired
-    private WorkflowImpl workflow;
+    private WorkFlowService workFlowService;
+    @Autowired
+    private CommonServiceImpl commonService;
     @Autowired
     private RedisUtils redisUtils;
 
@@ -120,13 +130,31 @@ public class AcceptanceRectificationOrderServiceImpl extends BaseService<Accepta
 
             basicGridAcceptance.setAcceptanceStatus(String.valueOf(Integer.parseInt(basicGridAcceptance.getAcceptanceStatus()) - 1));
 
-            StandardDto standardDto=new StandardDto();
-            standardDto.setTaskId(basicGridAcceptance.getNextTaskId());
-            workflow.standard(basicGridAcceptance,standardDto,userId);
-
+//            StandardDto standardDto=new StandardDto();
+//            standardDto.setTaskId(basicGridAcceptance.getNextTaskId());
+//            workflow.standard(basicGridAcceptance,standardDto,userId);
+            TaskResultDTO taskResultDTO = new TaskResultDTO();
+            taskResultDTO.setTaskId(basicGridAcceptance.getNextTaskId());
+            ProcessTaskDTO processTaskDTO = workFlowService.standard(basicGridAcceptance, taskResultDTO, userId);
+            //更新待办
+            WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
+            workflowResultDto.setInstanceId(basicGridAcceptance.getInstanceId());
+            updateAcceptanceRectificationOrderTask(basicGridAcceptance, workflowResultDto);
             basicGridAcceptanceMapper.updateById(basicGridAcceptance);
         }
         return model;
     }
+
+    private void updateAcceptanceRectificationOrderTask(BasicGridAcceptance basicGridAcceptance, WorkflowResultDto workflowResultDto) {
+        Map<String, Object> updateTaskParam = new HashMap<>();
+        updateTaskParam.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
+        updateTaskParam.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
+        updateTaskParam.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
+        updateTaskParam.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
+        updateTaskParam.put("model", basicGridAcceptance);
+        updateTaskParam.put("relationId", workflowResultDto.getInstanceId());
+        commonService.updateTaskModel(updateTaskParam);
+        commonService.buildTaskModel((commonService.buildTaskModelDto(basicGridAcceptance, workflowResultDto, BusinessTypeEnum.HYGF_BWYS)));
+    }
 }
 

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

@@ -238,6 +238,11 @@ public class CommonServiceImpl {
             }
             List<Map> urlList = JsonUtils.getResourceList(urlInfo);
             for (Map map : urlList) {
+                //此处单独处理经销商审核 审核完成后跳转列表页面
+                if("jxs_03".equals(collect.get(0).getTaskCode())){
+                    urlParams = "/mixuap?appId=1678340647909617665&id=1678365817248444417"+ urlParams;
+                    break;
+                }
                 if (map.get("type").equals(collect.get(0).getTaskCode())) {
                     urlParams = map.get("url").toString() + urlParams;
                     break;

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/json/urlInfo.json

@@ -93,54 +93,54 @@
     "type": "hygf_ys2",
     "pageType": "",
     "name": "管理端投融审核",
-    "url": ""
+    "url": "/mixuap?appId=1678340647909617665&id=1747528027618701313"
   },
   {
     "type": "hygf_zg_tr",
     "pageType": "",
     "name": "整改单",
-    "url": ""
+    "url": "/mixuap?appId=1677158789557547009&id=1747168313215053826"
   },
   {
     "type": "hygf_ys3",
     "pageType": "",
     "name": "管理端法务审核",
-    "url": ""
+    "url": "/mixuap?appId=1678340647909617665&id=1747528027618701313"
   },
   {
     "type": "hygf_zg_fw",
     "pageType": "",
     "name": "整改单",
-    "url": ""
+    "url": "/mixuap?appId=1677158789557547009&id=1747168313215053826"
   },
   {
     "type": "hygf_ys4",
     "pageType": "",
     "name": "管理端工程审核",
-    "url": ""
+    "url": "/mixuap?appId=1678340647909617665&id=1747528027618701313"
   },
   {
     "type": "hygf_zg_gc",
     "pageType": "",
     "name": "整改单",
-    "url": ""
+    "url": "/mixuap?appId=1677158789557547009&id=1747168313215053826"
   },
   {
     "type": "hygf_ys5",
     "pageType": "",
     "name": "管理端工程是否线下",
-    "url": ""
+    "url": "/mixuap?appId=1678340647909617665&id=1747528027618701313"
   },
   {
     "type": "hygf_ys6",
     "pageType": "",
     "name": "管理端工程线下验",
-    "url": ""
+    "url": "/mixuap?appId=1678340647909617665&id=1747528027618701313"
   },
   {
     "type": "hygf_zg_xx",
     "pageType": "",
     "name": "整改单",
-    "url": ""
+    "url": "/mixuap?appId=1677158789557547009&id=1747168313215053826"
   }
 ]
\ No newline at end of file