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

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java

@@ -100,6 +100,7 @@ public class ControllerAop {
         urls.add("/hygf/unit-info/region/tree");
         urls.add("/hygf/unit-info/management-unit/tree");
         urls.add("/hygf/unit-info/hasExistPhone/.*");
+		urls.add("/hygf/unit-info/hasExistUserName/.*");
         urls.add("/hygf/unit-info/sendTelCode/.*");
         urls.add("/hygf/unit-info/verifyTelCode/.*/.*");
         urls.add("/hygf/peasant-household/mobile/login");

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/config/GlobalExceptionHandler.java

 package com.yeejoin.amos.boot.module.hygf.api.config;
 
-import lombok.extern.slf4j.Slf4j;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.context.annotation.Primary;
 import org.springframework.http.HttpStatus;
-import org.springframework.validation.BindException;
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.FieldError;
-import org.springframework.validation.ObjectError;
-import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import org.springframework.web.multipart.MaxUploadSizeExceededException;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
+import com.alibaba.fastjson.JSONObject;
+
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * @description: 全局异常处理器
@@ -46,8 +44,13 @@ public class GlobalExceptionHandler {
 		response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
 		response.setTraceId(RequestContext.getTraceId());
 		response.setPath(request.getServletPath());
-		response.setDevMessage(e.getMessage());
-		response.setMessage(e.getMessage());
+	     // 获取异常的堆栈跟踪信息
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        e.printStackTrace(pw);
+        String stackTrace = sw.toString();
+		response.setDevMessage(stackTrace);
+		response.setMessage(stackTrace);
 		return response;
 	}
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PersonnelBusinessMapper.java

@@ -30,6 +30,17 @@ public interface PersonnelBusinessMapper extends BaseMapper<PersonnelBusiness> {
     UserUnitInformationDto getMaintenanceUserUnitInformationDto(@Param("userId")String userId);
 
 
+    String selectUserInfo(Long sequenceNbr);
 
+    void deletePauByUserId(String userId);
 
+    void deletePguByUserId(String userId);
+
+    void deleteSubByUserId(String userId);
+
+    void deleteHpbByFoundationId(Long sequenceNbr);
+
+    void deleteSueByUserId(String userId);
+
+    void deleteAliByUserId(String userId);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/UnitInfoMapper.java

@@ -29,7 +29,13 @@ public interface UnitInfoMapper extends BaseMapper<UnitInfo> {
 
     @UserEmpower(field ={"hygf_regional_companies.regional_companies_code"} ,dealerField ={} ,fieldConditions ={"in"} ,relationship="and")
     List<UnitInfo>   getlistUnitInfo();
+
+
 //    @UserEmpower(field ={"hygf_unit_info.regional_companies_code"} ,dealerField ={} ,fieldConditions ={"in"} ,relationship="and")
 //     UnitInfo  selectById( Long unitInfoId);
 
+   Integer getUserListHuiCount(String phone, String userName);
+   Integer getUserListPauCount(String phone, String userName);
+
+    Integer getUserListSubCount(String phone, String userName);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IPersonnelBusinessService.java

@@ -16,4 +16,5 @@ public interface IPersonnelBusinessService {
     IPage<CompanyDtoUserDto> getCompanyDtoUserDto( CompanyDtoUserDto dto);
     UserDataDto getPersonnelBusinessById(String id);
 
+    Object deleteAllBySequenceNbr(Long sequenceNbr);
 }

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

@@ -35,10 +35,9 @@
             <if test="params.type == 3 ">
                 and info.status in ('待整改','整改未完成')
             </if>
-
         </where>
         ORDER BY
-        info.rec_date DESC ,hph.sequence_nbr ASC ) as sta
+        info.rec_date DESC ,hph.sequence_nbr DESC ) as sta
         <where>
             <if test="params.status != null and params.status != ''">
                 and sta.status = #{params.status}

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

@@ -114,4 +114,38 @@ select  ORG_CODE orgCode from  privilege_company  where privilege_company.SEQUEN
     </select>
 
 
+
+    <select id="selectUserInfo"  resultType="String">
+        SELECT
+            sub.amos_user_id userId
+        FROM
+            std_user_biz sub
+        WHERE
+            sub.sequence_nbr =#{sequenceNbr}
+    </select>
+
+    <select id="deletePauByUserId">
+        DELETE FROM privilege_agency_user WHERE USER_ID=#{userId}
+    </select>
+
+    <select id="deletePguByUserId">
+        DELETE FROM privilege_group_user WHERE USER_ID=#{userId}
+    </select>
+
+     <select id="deleteSubByUserId">
+        DELETE FROM std_user_biz WHERE amos_user_id=#{userId}
+     </select>
+
+    <select id="deleteHpbByFoundationId">
+        DELETE FROM hygf_personnel_business WHERE foundation_id=#{sequenceNbr}
+    </select>
+
+    <select id="deleteSueByUserId">
+        DELETE FROM std_user_empower WHERE amos_user_id=#{userId}
+    </select>
+
+    <select id="deleteAliByUserId">
+        DELETE FROM auth_login_info WHERE USER_ID=#{userId}
+    </select>
+
 </mapper>

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

@@ -125,4 +125,42 @@ from  privilege_company  where IS_DELETED=0 and AGENCY_CODE='JXIOP'
 
     </select>
 
+    <select id="getUserListHuiCount" resultType="integer">
+        select count(*) from hygf_unit_info
+        <where>
+            audit_status != 3
+            <if test="phone != null and phone !=''">
+              and   admin_phone = #{phone}
+            </if>
+            <if test="userName != null and userName !=''">
+              and   admin_login_name = #{userName}
+            </if>
+        </where>
+    </select>
+
+    <select id="getUserListPauCount" resultType="integer">
+        select count(*) from privilege_agency_user
+        <where>
+            IS_DELETED != 1
+            <if test="phone != null and phone !=''">
+              and   MOBILE = #{phone}
+            </if>
+            <if test="userName != null and userName !=''">
+              and   USER_NAME = #{userName}
+            </if>
+        </where>
+    </select>
+
+    <select id="getUserListSubCount" resultType="integer">
+        select count(*) from std_user_biz
+        <where>
+            <if test="phone != null and phone !=''">
+                and   emergency_telephone = #{phone}
+            </if>
+            <if test="userName != null and userName !=''">
+                and  amos_user_name = #{userName}
+            </if>
+        </where>
+    </select>
+
 </mapper>

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

@@ -5,6 +5,7 @@ import cn.hutool.core.map.MapBuilder;
 import com.alibaba.fastjson.JSON;
 import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseNewUtil;
 import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseUtil;
+import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
@@ -47,6 +48,7 @@ public class FinancingInfoController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	@GlobalTransactional
 	public ResponseModel<FinancingInfoDto> save(@RequestBody FinancingInfoDto model) {
 	    model = financingInfoServiceImpl.saveModel(model);
 	    return ResponseHelper.buildResponse(model);
@@ -61,9 +63,15 @@ public class FinancingInfoController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	@GlobalTransactional
 	public ResponseModel<FinancingInfoDto> updateBySequenceNbrFinancingInfo(@RequestBody FinancingInfoDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
 	    model.setSequenceNbr(sequenceNbr);
 		model.setFile(JSON.toJSONString(model.getFiles()));
+		if (model.getFinancingCompaniesSeq() != null){
+			Map<String, Object> orgInfo = financingInfoServiceImpl.getBaseMapper().selectRZOrgInfo(model.getFinancingCompaniesSeq());
+			model.setFinancingCompaniesCode(orgInfo.getOrDefault("ORG_CODE", "").toString());
+			model.setFinancingCompaniesName(orgInfo.getOrDefault("COMPANY_NAME", "").toString());
+		}
 		financingInfoServiceImpl.updateWithModel(model);
 		if (null != model.getDisbursementMoney() && model.getStatus() != "放款完成" ){
 			Map<String, Object> map = BeanUtil.beanToMap(model);
@@ -139,6 +147,7 @@ public class FinancingInfoController extends BaseController {
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "撤回",   notes = "撤回")
+	@GlobalTransactional
 	@GetMapping(value = "/rollback")
 	public ResponseModel rollback(String instanceId,String peasantHouseholdId) {
 		 financingInfoServiceImpl.rollback(instanceId,peasantHouseholdId);
@@ -149,6 +158,7 @@ public class FinancingInfoController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "POST",value = "审核",   notes = "审核")
 	@PostMapping(value = "/execueFlow")
+	@GlobalTransactional
 	public ResponseModel execueFlow(@RequestBody Map<String, Object> params) {
 		financingInfoServiceImpl.execueFlow(params);
 		return CommonResponseNewUtil.success();

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

@@ -95,6 +95,19 @@ public class PersonnelBusinessController extends BaseController {
     }
 
     /**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/all/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除人员信息", notes = "根据sequenceNbr删除人员信息")
+    public ResponseModel<Boolean> deleteAllBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(personnelBusinessServiceImpl.deleteAllBySequenceNbr(sequenceNbr));
+    }
+
+    /**
      * 根据sequenceNbr查询
      *
 	 * @param sequenceNbr  主键
@@ -107,6 +120,8 @@ public class PersonnelBusinessController extends BaseController {
 	    return ResponseHelper.buildResponse(personnelBusinessServiceImpl.queryBySeq(sequenceNbr));
 	}
 
+
+
 	/**
      * 列表分页查询
      *

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

@@ -332,7 +332,21 @@ public class UnitInfoController extends BaseController {
 
 
 
-
+    /**
+     * 判断用户名是否存在
+     *
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/hasExistUserName/{userName}")
+    @ApiOperation(httpMethod = "GET", value = "判断用户名是否存在", notes = "判断用户名是否存在")
+    public ResponseModel hasExistUserName( @PathVariable(value = "userName") String userName) {
+        try {
+            return CommonResponseNewUtil.success(unitInfoServiceImpl.hasExistPhoneOrUserName(null, userName));
+        } catch (Exception e) {
+            return CommonResponseNewUtil.failure("该用户名已经注册");
+        }
+    }
 
 
 
@@ -346,7 +360,7 @@ public class UnitInfoController extends BaseController {
 	@ApiOperation(httpMethod = "GET", value = "判断用户号码是否存在", notes = "判断用户号码是否存在")
 	public ResponseModel hasExistPhone( @PathVariable(value = "phone") String phone) {
 		try {
-			return CommonResponseNewUtil.success(Privilege.agencyUserClient.checkLoginId(phone).getResult());
+			return CommonResponseNewUtil.success(unitInfoServiceImpl.hasExistPhoneOrUserName(phone, null));
 		} catch (Exception e) {
 			return CommonResponseNewUtil.failure("该手机号已经注册");
 		}
@@ -610,6 +624,24 @@ public class UnitInfoController extends BaseController {
         return ResponseHelper.buildResponse(chil);
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getGroupTreeAll")
+    @ApiOperation(httpMethod = "GET", value = "经销商用户组全部", notes = "经销商用户组全部")
+    public ResponseModel<Collection<GroupModel>> getGroupTreeAll() {
+
+        FeignClientResult<Collection<GroupModel>>  feignClientResult= Privilege.groupClient.selectForList(group,null);
+        Collection<GroupModel> children =  feignClientResult.getResult();
+        Collection<GroupModel> chil =new ArrayList<>();
+        for (GroupModel child : children) {
+            if("用户光伏-农户".equals(child.getGroupName())){
+                //排除其余角色
+            }else{
+                chil.add(child);
+            }
+        }
+        return ResponseHelper.buildResponse(chil);
+    }
+
 
     //根据角色获取区域公司
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -656,9 +688,7 @@ public class UnitInfoController extends BaseController {
             FeignClientResult<Collection<CompanyModel>> feignClientResult=  Privilege.companyClient.querySubAgencyTree(regionalCompanies);
 
              companyModel = (List<CompanyModel>)feignClientResult.getResult();
-
         }
-
        return  ResponseHelper.buildResponse(companyModel);
     }
 
@@ -741,9 +771,6 @@ public class UnitInfoController extends BaseController {
     public ResponseModel< List<Map<String,Object>> > getUnitInfoListData(
             @RequestParam(required=false) Long unitInfoId,
             @RequestParam(required=false) Long regionalCompaniesSeq
-
-
-
     ) {
         UnitInfo unitInfo=unitInfoMapper.selectById(unitInfoId);
         List<PeasantHousehold>  list=peasantHouseholdMapper.selectPeasantHouseholdList(unitInfo.getAmosCompanySeq(),regionalCompaniesSeq,null,null,null);

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

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 import java.util.Map;
 
-@FeignClient(name = "AMOS-API-WORKFLOW", path = "workflow", configuration = {XidFeignConfiguration.class})
+@FeignClient(name = "${workflow.feign.name}", path = "workflow", configuration = {XidFeignConfiguration.class})
 public interface WorkFlowFeignService {
 
     /***

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

@@ -34,6 +34,8 @@ public class BasicGridAcceptanceServiceImpl
 	@Autowired
 	HygfOnGridMapper onGridMapper;
 	@Autowired
+	HygfOnGridServiceImpl hygfOnGridServiceImpl;
+	@Autowired
 	PersonnelBusinessMapper personnelBusinessMapper;
 	@Autowired
 	WorkflowImpl workflow;
@@ -124,11 +126,17 @@ public class BasicGridAcceptanceServiceImpl
 			peasantHouseholdMapper.update(null, up);
 
 		}
-		if (grid.getSequenceNbr() != null) {
-			onGridMapper.updateById(grid);
-		} else {
-			onGridMapper.insert(grid);
-		}
+		
+		//防止重复提交
+//		if (grid.getSequenceNbr() != null) {
+//			onGridMapper.updateById(grid);
+//		} else {
+//			onGridMapper.insert(grid);
+//		}
+		LambdaQueryWrapper<HygfOnGrid> hog = new LambdaQueryWrapper<>();
+		hog.eq(HygfOnGrid::getPeasantHouseholdId, grid.getPeasantHouseholdId());
+		hygfOnGridServiceImpl.saveOrUpdate(grid,hog);
+		
 		basicGridAcceptanceMapper.updateById(basicGridAcceptance);
 
 		//发起待办

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

@@ -110,13 +110,12 @@ public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, Dealer
         } catch (Exception e) {
         	 e.printStackTrace();
         	 return false;
-            //throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
+            //
         }
     }
 
     public WorkDto getNodeInfoCode(String flowTaskId, boolean token) {
         WorkDto workDto = null;
-        try {
             FeignClientResult<JSONObject> jSONObject = null;
             if (token) {
                 jSONObject = workflowFeignClient.getNodeInfo(flowTaskId);
@@ -145,16 +144,11 @@ public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, Dealer
             }
 
             return workDto;
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
 
-        }
     }
 
     public String getTaskNoAuth(String processInstanceId, boolean token) {
         String flowTaskId = null;
-        try {
             JSONObject jSONObject = null;
             if (token) {
                 jSONObject = workflowFeignClient.getTaskNoAuth(processInstanceId);
@@ -170,11 +164,7 @@ public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, Dealer
                 throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
             }
             return flowTaskId;
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
 
-        }
     }
 
 }

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -113,7 +114,6 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
         return this.queryForList("", false);
     }
 
-    @GlobalTransactional
     public FinancingInfoDto saveModel(FinancingInfoDto model) {
         List<String> ids;
         if (model.getPeasantHouseholdIds().contains(",")) {
@@ -121,7 +121,6 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
         } else {
             ids = Arrays.asList(new String[]{model.getPeasantHouseholdIds()});
         }
-
         Map<String, Object> orgInfo = this.getBaseMapper().selectRZOrgInfo(model.getFinancingCompaniesSeq());
         model.setFinancingCompaniesCode(orgInfo.getOrDefault("ORG_CODE", "").toString());
         model.setFinancingCompaniesName(orgInfo.getOrDefault("COMPANY_NAME", "").toString());
@@ -136,33 +135,51 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
                 BeanUtils.copyProperties(model, financingInfoDto);
                 financingInfoDto.setSequenceNbr(null);
                 this.createWithModel(financingInfoDto);
-            } else {
+                //开启工作流 并执行一步
+                ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
+                List<ActWorkflowStartDTO> list = new ArrayList<>();
+                ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
+                dto.setProcessDefinitionKey(PROCESSKEY);
+                Date date = new Date();
+                dto.setBusinessKey(String.valueOf(date.getTime()));
+                dto.setCompleteFirstTask(true);
+                //工作流程图第一步执行后存在互斥网关 isFlag为表达式 默认为1执行到融资审核
+                HashMap<String, Object> map = new HashMap<>();
+                map.put("isFlag", "0");
+                dto.setVariables(map);
+                list.add(dto);
+                actWorkflowBatchDTO.setProcess(list);
+                List<ProcessTaskDTO> processTaskDTOS = workFlowService.startBatch(actWorkflowBatchDTO);
+                List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(processTaskDTOS);
+                WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
+                FinancingAuditingDto financingAuditingDto = new FinancingAuditingDto();
+                BeanUtils.copyProperties(workflowResultDto, financingAuditingDto);
+                financingAuditingDto.setPeasantHouseholdId(Long.valueOf(e));
+                financingAuditingDto.setPromoter(RequestContext.getExeUserId());
+                financingAuditingService.createWithModel(financingAuditingDto);
+            }
+            //批量 兼容审核不通过及整改待推送
+            else if (financingInfos.getStatus().equals(FinancingAuditEnum.审核不通过.getName()) || financingInfos.getStatus().equals(FinancingAuditEnum.整改待推送.getName()) ){
                 financingInfos.setStatus(FinancingAuditEnum.待融资审核.getName());
+
+                Map<String, Object> orgInfo1 = this.getBaseMapper().selectRZOrgInfo(model.getFinancingCompaniesSeq());
+                //业务表中无工作流id 需要补充
+                LambdaQueryWrapper<FinancingAuditing> queryWrapper1 = new LambdaQueryWrapper<>();
+                queryWrapper1.eq(FinancingAuditing::getPeasantHouseholdId, Long.valueOf(e));
+                queryWrapper1.orderByDesc(BaseEntity::getRecDate);
+                queryWrapper1.last("limit 1");
+                FinancingAuditing financingInfos1 = financingAuditingService.getBaseMapper().selectOne(queryWrapper1);
+
+
+                financingInfos.setFinancingCompaniesCode(orgInfo1.getOrDefault("ORG_CODE", "").toString());
+                financingInfos.setFinancingCompaniesName(orgInfo1.getOrDefault("COMPANY_NAME", "").toString());
                 this.updateById(financingInfos);
+                Map<String, Object> map = BeanUtil.beanToMap(financingInfos);
+                map.put("isFlag","0");
+                map.put("instanceId",financingInfos1.getInstanceId());
+                this.execueFlow(map);
             }
 
-            //开启工作流 并执行一步
-            ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
-            List<ActWorkflowStartDTO> list = new ArrayList<>();
-            ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
-            dto.setProcessDefinitionKey(PROCESSKEY);
-            Date date = new Date();
-            dto.setBusinessKey(String.valueOf(date.getTime()));
-            dto.setCompleteFirstTask(true);
-            //工作流程图第一步执行后存在互斥网关 isFlag为表达式 默认为1执行到融资审核
-            HashMap<String, Object> map = new HashMap<>();
-            map.put("isFlag", "0");
-            dto.setVariables(map);
-            list.add(dto);
-            actWorkflowBatchDTO.setProcess(list);
-            List<ProcessTaskDTO> processTaskDTOS = workFlowService.startBatch(actWorkflowBatchDTO);
-            List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(processTaskDTOS);
-            WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
-            FinancingAuditingDto financingAuditingDto = new FinancingAuditingDto();
-            BeanUtils.copyProperties(workflowResultDto, financingAuditingDto);
-            financingAuditingDto.setPeasantHouseholdId(Long.valueOf(e));
-            financingAuditingDto.setPromoter(RequestContext.getExeUserId());
-            financingAuditingService.createWithModel(financingAuditingDto);
             //发起待办
 //            commonService.buildTaskModel(buildDZTRZTaskModel(model, workflowResultDto, date));
         });
@@ -203,7 +220,6 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
 
 
     @Override
-    @GlobalTransactional
     public void rollback(String processId, String peasantHouseholdId) {
         workFlowService.stopProcess(processId);
         LambdaQueryWrapper<FinancingInfo> queryWrapper = new LambdaQueryWrapper<>();
@@ -228,7 +244,6 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
     }
 
     @Override
-    @GlobalTransactional
     public void execueFlow(Map<String, Object> params) {
         LambdaQueryWrapper<FinancingAuditing> query = new LambdaQueryWrapper<>();
         query.eq(FinancingAuditing::getInstanceId, params.get("instanceId").toString());
@@ -276,7 +291,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
         LambdaQueryWrapper<FinancingInfo> info = new LambdaQueryWrapper<>();
         info.eq(FinancingInfo::getPeasantHouseholdId, financingAuditing.getPeasantHouseholdId());
         FinancingInfo financingInfo = this.getBaseMapper().selectOne(info);
-        if (params.containsKey("financingCompaniesSeq")) {
+        if (params.containsKey("financingCompaniesSeq") && params.get("financingCompaniesSeq")!= null) {
             financingInfo.setFinancingCompaniesSeq(Long.valueOf(params.get("financingCompaniesSeq").toString()));
         }
         //标识对于整改待推送状态
@@ -285,6 +300,8 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
         } else {
             financingInfo.setStatus(statusName);
         }
+
+
         this.updateById(financingInfo);
 
         //节点为待整改时生成整改单

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -44,7 +45,7 @@ import java.util.*;
  * @date 2023-09-01
  */
 @Service
-public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessDto,PersonnelBusiness,PersonnelBusinessMapper> implements IPersonnelBusinessService {
+public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessDto, PersonnelBusiness, PersonnelBusinessMapper> implements IPersonnelBusinessService {
     @Autowired
     PersonnelBusinessMapper personnelBusinessMapper;
     @Autowired
@@ -369,10 +370,10 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
 
 
              System.out.println("删除旧管理员===================================:"+publicAgencyUsex.getAmosUserId());
-
+            List<String> userId1 = new ArrayList<>();
              if(roidx!=null&&!roidx.isEmpty()&&roidx.size()==1&&roidx.get(0).longValue()==userGroupId){
                  //新增空角色防止单位丢失
-                 List<String> userId1 = new ArrayList<>();
+
                  userId1.add(publicAgencyUsex.getAmosUserId());
                  Privilege.groupUserClient.create(userGroupempty, userId1);
              }
@@ -394,7 +395,7 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
                 publicAgencyUsex.setRole(null);
             }else{
                 roidx.remove(userGroupId);
-                publicAgencyUsex.setRole(JSON.toJSONString(roidx));
+                publicAgencyUsex.setRole(CollectionUtil.isEmpty(roidx)? JSON.toJSONString(Arrays.asList(userGroupempty)):JSON.toJSONString(roidx));
             }
             //修改当前用户角色权限
             List<Long>  roid= JSONArray.parseArray(publicAgencyUse.getRole(),Long.class);
@@ -402,6 +403,10 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
                 roid=new ArrayList<>();
             }
             roid.add(userGroupId);
+            if (roid.contains(userGroupempty)){
+                roid.remove(userGroupempty);
+                Privilege.groupUserClient.deleteGroupUser(userGroupempty,publicAgencyUsex.getAmosUserId());
+            }
             publicAgencyUse.setRole(JSON.toJSONString(roid));
 
             publicAgencyUserMapper.updateById(publicAgencyUsex);
@@ -492,4 +497,29 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
         return new UserDataDto( userDataZHDto, userDataJBDto ,  userDataZZDto);
     }
 
+    @Override
+    public Boolean deleteAllBySequenceNbr(Long sequenceNbr) {
+        try {
+//        根据sequenceNbr查询用户userId
+            String userId = personnelBusinessMapper.selectUserInfo(sequenceNbr);
+//        删除privilege_agency_user表中数据
+            personnelBusinessMapper.deletePauByUserId(userId);
+//        删除privilege_group_user表中数据
+            personnelBusinessMapper.deletePguByUserId(userId);
+//        删除std_user_biz表中数据
+            personnelBusinessMapper.deleteSubByUserId(userId);
+//        删除hygf_personnel_business表中数据
+            personnelBusinessMapper.deleteHpbByFoundationId(sequenceNbr);
+//        删除std_user_empower表中数据
+            personnelBusinessMapper.deleteSueByUserId(userId);
+//        删除auth_login_info表中数据
+            personnelBusinessMapper.deleteAliByUserId(userId);
+            return null;
+        } catch (Exception e) {
+            throw new BadRequest("删除失败！");
+        }
+
+
+    }
+
 }
\ No newline at end of file

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

@@ -152,7 +152,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
     @Override
     @Transactional
     public boolean savePowerStation(PowerStation powerStation, boolean flag,String name,String meg) {
-        try{
+		try {
             //流程节点code
 //            if (flag) {
 //                String flowTaskIdnext = this.getTaskNoAuth(powerStation.getProcessInstanceId());
@@ -220,8 +220,8 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 			return fl;
 		} catch (Exception e) {
 			e.printStackTrace();
-			throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
 		}
+		return false;
 	}
 
 	@Override
@@ -353,7 +353,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 			// }
 		} catch (Exception e) {
 			e.printStackTrace();
-			throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
+
 
 		}
 		return code;
@@ -438,7 +438,6 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 
 	public WorkDto getNodeInfoCode(String flowTaskId) {
 		WorkDto workDto = null;
-		try {
 			FeignClientResult<JSONObject> jSONObject = workflowFeignClient.getNodeInfo(flowTaskId);
 			if (IDX_REQUEST_STATE.equals(String.valueOf(jSONObject.getStatus()))) {
 				JSONObject js = jSONObject.getResult();
@@ -463,16 +462,12 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 			}
 
 			return workDto;
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
 
-		}
 	}
 
 	public String getTaskNoAuth(String processInstanceId) {
 		String flowTaskId = null;
-		try {
+
 			JSONObject jSONObject = workflowFeignClient.getTaskNoAuth(processInstanceId);
 			if (IDX_REQUEST_STATE.equals(String.valueOf(jSONObject.get("code")))) {
 				LinkedHashMap jsd = jSONObject.get("data") != null ? (LinkedHashMap) jSONObject.get("data") : null;
@@ -482,11 +477,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 				throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
 			}
 			return flowTaskId;
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
 
-		}
 	}
 
 	// 设计信息填充

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

@@ -282,7 +282,6 @@ public class SurveyInformationServiceImpl
 
         } catch (Exception e) {
             e.printStackTrace();
-            throw new BadRequest("系统异常");
         }
 
         return surveyInfoAllDto;
@@ -369,7 +368,6 @@ public class SurveyInformationServiceImpl
 
         } catch (Exception e) {
             e.printStackTrace();
-            throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
         }
 
 //        PowerStation powerStation = powerStationService.getObjByNhId(String.valueOf(peasantHousehold.getSequenceNbr()), PowerStationProcessStateEnum.作废.getCode());

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

@@ -1056,4 +1056,20 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
         pagenew.setRecords(page.getList());
         return pagenew;
     }
+
+    public Boolean hasExistPhoneOrUserName(String phone, String userName) {
+        Integer userListHuiCount = unitInfoMapper.getUserListHuiCount(phone, userName);
+        Integer userListPauCount = unitInfoMapper.getUserListPauCount(phone, userName);
+        Integer userListSubCount = unitInfoMapper.getUserListSubCount(phone, userName);
+
+        if((userListHuiCount != 0 || userListPauCount != 0 || userListSubCount != 0) && phone != null) {
+            throw new BadRequest("该手机号已经注册");
+        }
+
+        if((userListHuiCount != 0 || userListPauCount != 0 || userListSubCount != 0) && userName != null) {
+            throw new BadRequest("该用户名已经注册");
+        }
+        return true;
+
+    }
 }
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-dev.properties

@@ -234,9 +234,14 @@ seata.service.grouplist.hygf-seata=47.92.234.253:8091
 # Seata 配置
 seata.enabled=true
 seata.enable-auto-data-source-proxy=false
-#seata.client.undo.log-serialization=kryo
 
 seata.datasource.autoproxy.datasource-proxy-mode=original
 seata.datasource.autoproxy.enabled=true
 seata.datasource.autoproxy.data-source-names=mysql
 
+## 47环境 排除es报错引进无用配置 业务未实际使用es
+spring.elasticsearch.rest.uris=http://47.92.234.253:9200
+spring.elasticsearch.rest.connection-timeout=30000
+spring.elasticsearch.rest.username=elastic
+spring.elasticsearch.rest.password=123456
+spring.elasticsearch.rest.read-timeout=30000
\ No newline at end of file

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

@@ -74,6 +74,7 @@ public class MonitorServiceImpl implements MonitorService {
         for (StationType value : StationType.values()) {
             Map<String, Object> map = new LinkedHashMap<>();
             List<StationCacheInfoDto> dtos = listMap.get(value.getCode());
+            map.put("key", value.getCode());
             map.put("data", dtos == null ? 0 : dtos.size());
             map.put("title", dtos == null ? 0 : dtos.stream().filter(obj -> !ObjectUtils.isEmpty(obj.getInstalledCapacity())).mapToDouble(l -> Double.parseDouble(l.getInstalledCapacity())).sum());
             map.put("title", keepTwodecimalPlaces(Double.valueOf(map.get("title").toString())));