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

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

@@ -35,6 +35,9 @@
             <if test="params.type == 3 ">
                 and info.status in ('待整改','整改未完成')
             </if>
+            <if test="params.peasantHouseholdNo != null and params.peasantHouseholdNo !='' ">
+                and hph.peasant_household_no = #{params.peasantHouseholdNo}
+            </if>
 
         </where>
         ORDER BY

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/FinancingInfoController.java

@@ -117,11 +117,12 @@ public class FinancingInfoController extends BaseController {
 	public ResponseModel<Page<Map<String, Object>>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size,@RequestParam(value = "type") String type,
 																 @RequestParam(value = "status",required = false) String status,
 																 @RequestParam(value = "regionalCompaniesCode" ,required = false) String regionalCompaniesCode ,
-																 @RequestParam(value = "ownersName",required = false) String ownersName){
+																 @RequestParam(value = "ownersName",required = false) String ownersName,
+																 @RequestParam(value = "peasantHouseholdNo",required = false) String peasantHouseholdNo){
 	    Page<Map<String, Object>> page = new Page<Map<String, Object>>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-	    return ResponseHelper.buildResponse(financingInfoServiceImpl.queryForFinancingInfoPage(page,type,status,regionalCompaniesCode,ownersName));
+	    return ResponseHelper.buildResponse(financingInfoServiceImpl.queryForFinancingInfoPage(page,type,status,regionalCompaniesCode,ownersName,peasantHouseholdNo));
 	}
 
 	/**

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/feign/TaskV2FeignService.java

@@ -4,10 +4,7 @@ import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -30,6 +27,19 @@ public interface TaskV2FeignService {
     FeignClientResult<List<TaskV2Model>> batchAdd(@RequestBody List<TaskV2Model> modelList) throws InnerInvokException;
 
     /**
+     * 批量新增任务
+     *
+     * @param modelList 新增待办
+     * @return TaskV2Model
+     * @throws InnerInvokException e
+     */
+    @RequestMapping(value = "/batch/add", method = RequestMethod.POST)
+    FeignClientResult<List<TaskV2Model>> batchAddNew(@RequestHeader(name = "appKey", required = true) String appKey,
+                                                     @RequestHeader(name = "product", required = true) String product,
+                                                     @RequestHeader(name = "token", required = true) String token,
+                                                     @RequestBody List<TaskV2Model> modelList) throws InnerInvokException;
+
+    /**
      * 更新任务
      *
      * @param model       待办信息

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

@@ -284,7 +284,9 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 
         basicGridAcceptanceMapper.updateById(basicGridAcceptanc);
         //更新待办
-        updateBasicGridAcceptanceTask(basicGridAcceptanc, workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0));
+        WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
+        workflowResultDto.setInstanceId(basicGridAcceptanc.getInstanceId());
+        updateBasicGridAcceptanceTask(basicGridAcceptanc, workflowResultDto);
     }
 
     /**

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

@@ -181,7 +181,12 @@ public class CommonServiceImpl {
             taskV2Models.add(model);
 
         }
-        taskV2FeignService.batchAdd(taskV2Models);
+        //如果使用的是机器人则使用机器人的token、appkey、product进行调用
+        if (amosRequestContext.getUserId().equals(RequestContext.getExeUserId())) {
+            taskV2FeignService.batchAddNew(amosRequestContext.getAppKey(), amosRequestContext.getProduct(), amosRequestContext.getToken(), taskV2Models);
+        } else {
+            taskV2FeignService.batchAdd(taskV2Models);
+        }
     }
 
     private void dealStartUser(TaskModelDto obj) {

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

@@ -66,7 +66,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
     private CommonServiceImpl commonService;
 
     @UserLimits
-    public Page<Map<String, Object>> queryForFinancingInfoPage(Page<Map<String, Object>> page, String type, String status, String regionalCompaniesCode, String ownersName) {
+    public Page<Map<String, Object>> queryForFinancingInfoPage(Page<Map<String, Object>> page, String type, String status, String regionalCompaniesCode, String ownersName,String peasantHouseholdNo) {
         StdUserEmpower orgCode = (StdUserEmpower) redisUtils.get("Emp_" + RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         List<String> amosOrgCodes = orgCode.getAmosOrgCode();
@@ -75,6 +75,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
         params.put("status", status);
         params.put("regionalCompaniesCode", regionalCompaniesCode);
         params.put("type", type);
+        params.put("peasantHouseholdNo",peasantHouseholdNo);
         // 1 投融人员  2.融资  3经销商管理员
         switch (type) {
             case "1":

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

@@ -380,8 +380,10 @@ public class SurveyInformationServiceImpl
             long idsk = peasantHousehold.getSequenceNbr();
             up.eq(PeasantHousehold::getSequenceNbr, idsk);
             peasantHouseholdMapper.update(null, up);
-            List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(processTaskDTOS);
-            commonService.buildTaskModel(commonService.buildTaskModelDto(powerStation, workflowResultDtos.get(0), BusinessTypeEnum.HYGF_DZ_SH));
+            //添加待办
+            WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(processTaskDTOS).get(0);
+            workflowResultDto.setInstanceId(powerStation.getProcessInstanceId());
+            commonService.buildTaskModel(commonService.buildTaskModelDto(powerStation, workflowResultDto, BusinessTypeEnum.HYGF_DZ_SH));
 
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -560,7 +560,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
 
 
     @Override
-    @Transactional
+    @GlobalTransactional
     public String powerStationExamine(long pageId, String nodeCode, String stationId, String taskId, String planInstanceId, Map<String, Object> kv) {
 
         // 2.更新审核记录表
@@ -676,8 +676,8 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
             this.saveOrUpdate(unitInfo);
             //更新待办
             WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
-            workflowResultDto.setInstanceId(planInstanceId);
-            updateUnitInfoTask(dealerReview, workflowResultDto);
+            workflowResultDto.setInstanceId(dealerReview.getProcessInstanceId());
+            updateUnitInfoTask(unitInfo, workflowResultDto);
 
 
         } catch (Exception e) {
@@ -816,16 +816,16 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
         return code;
     }
 
-    private void updateUnitInfoTask(DealerReview dealerReview, WorkflowResultDto workflowResultDto) {
+        private void updateUnitInfoTask(UnitInfo unitInfo, 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", dealerReview);
+        updateTaskParam.put("model", unitInfo);
         updateTaskParam.put("relationId", workflowResultDto.getInstanceId());
         commonService.updateTaskModel(updateTaskParam);
-        commonService.buildTaskModel((commonService.buildTaskModelDto(dealerReview, workflowResultDto, BusinessTypeEnum.HYGF_JXS_SH)));
+        commonService.buildTaskModel((commonService.buildTaskModelDto(unitInfo, workflowResultDto, BusinessTypeEnum.HYGF_JXS_SH)));
     }
 
     @Override