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/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,11 @@ 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);
 }

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/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,29 @@ 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>
+            <if test="phone != null and phone !=''">
+              and   MOBILE = #{phone}
+            </if>
+            <if test="userName != null and userName !=''">
+              and   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/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("该手机号已经注册");
 		}

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

@@ -45,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
@@ -497,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/UnitInfoServiceImpl.java

@@ -1056,4 +1056,19 @@ 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);
+
+        if((userListHuiCount != 0 || userListPauCount != 0) && phone != null) {
+            throw new BadRequest("该手机号已经注册");
+        }
+
+        if((userListHuiCount != 0 || userListPauCount != 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/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/WorkOrderServiceImpl.java

@@ -296,10 +296,11 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		// 新增施工信息
 		// 防止重复添加
 		LambdaUpdateWrapper<PowerStationConstructionData> psc = new LambdaUpdateWrapper();
-		psc.eq(PowerStationConstructionData::getWorkOrderPowerStationId, powerStationConstructionData.getWorkOrderPowerStationId());
+		psc.eq(PowerStationConstructionData::getWorkOrderPowerStationId,
+				powerStationConstructionData.getWorkOrderPowerStationId());
 		psc.eq(PowerStationConstructionData::getWorkOrderId, powerStationConstructionData.getWorkOrderId());
-		powerStationConstructionDataService.saveOrUpdate(powerStationConstructionData,psc);
-		//powerStationConstructionDataService.saveOrUpdate(powerStationConstructionData);
+		powerStationConstructionDataService.saveOrUpdate(powerStationConstructionData, psc);
+		// powerStationConstructionDataService.saveOrUpdate(powerStationConstructionData);
 
 		// 增加操作日志
 		if (powerStationConstructionData.getSequenceNbr() != null) {
@@ -836,7 +837,13 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		powerStationEngineeringInfo.setWorkOrderId(workOrderPowerStation.getWorkOrderId());
 		powerStationEngineeringInfo
 				.setWorkOrderPowerStationId(powerStationEngineeringInfoAllDto.getWorkOrderPowerStationId());
-		powerStationEngineeringInfoService.saveOrUpdate(powerStationEngineeringInfo);
+		// 防止重复提交
+		LambdaQueryWrapper<PowerStationEngineeringInfo> pse = new LambdaQueryWrapper<>();
+		pse.eq(PowerStationEngineeringInfo::getWorkOrderId, powerStationEngineeringInfo.getWorkOrderId()).eq(
+				PowerStationEngineeringInfo::getWorkOrderPowerStationId,
+				powerStationEngineeringInfo.getWorkOrderPowerStationId());
+		// powerStationEngineeringInfoService.saveOrUpdate(powerStationEngineeringInfo);
+		powerStationEngineeringInfoService.saveOrUpdate(powerStationEngineeringInfo, pse);
 		// 增加操作日志
 		ConstructionRecords da = new ConstructionRecords(powerStationEngineeringInfo.getRecUserName(), "完工登记",
 				new Date(), "", workOrderPowerStation.getWorkOrderId(), workOrderPowerStation.getSequenceNbr(),
@@ -869,69 +876,68 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 	}
 
 	@Transactional(isolation = Isolation.REPEATABLE_READ)
-    public ConstructionRecords  addConstructionRecords(ConstructionRecords constructionRecords){
+	public ConstructionRecords addConstructionRecords(ConstructionRecords constructionRecords) {
 		synchronized (constructionRecords) {
-			  LambdaQueryWrapper<WorkOrderPowerStation> qu=new LambdaQueryWrapper();
-		        qu.eq(WorkOrderPowerStation::getSequenceNbr,constructionRecords.getWorkOrderPowerStationId());
-		        WorkOrderPowerStation workOrderPowerStation=workOrderPowerStationMapper.selectOne(qu);
+			LambdaQueryWrapper<WorkOrderPowerStation> qu = new LambdaQueryWrapper();
+			qu.eq(WorkOrderPowerStation::getSequenceNbr, constructionRecords.getWorkOrderPowerStationId());
+			WorkOrderPowerStation workOrderPowerStation = workOrderPowerStationMapper.selectOne(qu);
 
-		         if(constructionRecords.getOperationResults().equals("通过")){
-		             //修改电站状态
+			if (constructionRecords.getOperationResults().equals("通过")) {
+				// 修改电站状态
 				workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.已完工.getCode());
 
-		             //修改完工时间
-		             LambdaUpdateWrapper<PowerStationEngineeringInfo> upq1=new LambdaUpdateWrapper();
-		             upq1.eq(PowerStationEngineeringInfo::getWorkOrderPowerStationId,workOrderPowerStation.getSequenceNbr());
-		             upq1.set(PowerStationEngineeringInfo::getCompletionDate,new Date());
-		             powerStationEngineeringInfoMapper.update(null,upq1);
+				// 修改完工时间
+				LambdaUpdateWrapper<PowerStationEngineeringInfo> upq1 = new LambdaUpdateWrapper();
+				upq1.eq(PowerStationEngineeringInfo::getWorkOrderPowerStationId,
+						workOrderPowerStation.getSequenceNbr());
+				upq1.set(PowerStationEngineeringInfo::getCompletionDate, new Date());
+				powerStationEngineeringInfoMapper.update(null, upq1);
 
-		             BasicGridAcceptance dat=new BasicGridAcceptance();
+				BasicGridAcceptance dat = new BasicGridAcceptance();
 				dat.setWorkOrderId(workOrderPowerStation.getWorkOrderId());
 				dat.setWorkOrderPowerStationId(workOrderPowerStation.getSequenceNbr());
 				dat.setPeasantHouseholdId(workOrderPowerStation.getPeasantHouseholdId());
 				dat.setGridStatus("1");
 
-		             //新增并网记录
+				// 新增并网记录
 				LambdaQueryWrapper<BasicGridAcceptance> bga = new LambdaQueryWrapper<>();
 				bga.eq(BasicGridAcceptance::getPeasantHouseholdId, workOrderPowerStation.getPeasantHouseholdId());
 				BasicGridAcceptance b = basicGridAcceptanceMapper.selectOne(bga);
-		             //防止重复增加
-		             if(b==null) 
-		             {
+				// 防止重复增加
+				if (b == null) {
 					basicGridAcceptanceMapper.insert(dat);
 				}
 				workOrderPowerStationMapper.updateById(workOrderPowerStation);
-		             //修改派工单状态
-		             LambdaQueryWrapper<WorkOrderPowerStation> qu1=new LambdaQueryWrapper();
-		             qu1.eq(WorkOrderPowerStation::getWorkOrderId,workOrderPowerStation.getWorkOrderId());
-		             List<String> d=new ArrayList<>();
+				// 修改派工单状态
+				LambdaQueryWrapper<WorkOrderPowerStation> qu1 = new LambdaQueryWrapper();
+				qu1.eq(WorkOrderPowerStation::getWorkOrderId, workOrderPowerStation.getWorkOrderId());
+				List<String> d = new ArrayList<>();
 				d.add(WorkOrderEnum.施工中.getCode());
 				d.add(WorkOrderEnum.待施工.getCode());
 				d.add(WorkOrderEnum.待登记.getCode());
 				d.add(WorkOrderEnum.待审核.getCode());
-		             qu1.in(WorkOrderPowerStation::getPowerStationConstructionStatus,d);
-		             List<WorkOrderPowerStation> list=workOrderPowerStationMapper.selectList(qu1);
-		             LambdaUpdateWrapper<WorkOrder> upq=new LambdaUpdateWrapper();
-		             upq.eq(WorkOrder::getSequenceNbr,workOrderPowerStation.getWorkOrderId());
-		             if(list==null||list.isEmpty()){
-		                 upq.set(WorkOrder::getWorkOrderStatus,WorkOrderEnum.已完工.getCode());
-		                 workOrderMapper.update(null,upq);
-		             }
-		         }else{
-		             //修改电站状态
+				qu1.in(WorkOrderPowerStation::getPowerStationConstructionStatus, d);
+				List<WorkOrderPowerStation> list = workOrderPowerStationMapper.selectList(qu1);
+				LambdaUpdateWrapper<WorkOrder> upq = new LambdaUpdateWrapper();
+				upq.eq(WorkOrder::getSequenceNbr, workOrderPowerStation.getWorkOrderId());
+				if (list == null || list.isEmpty()) {
+					upq.set(WorkOrder::getWorkOrderStatus, WorkOrderEnum.已完工.getCode());
+					workOrderMapper.update(null, upq);
+				}
+			} else {
+				// 修改电站状态
 				workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.未通过.getCode());
 				workOrderPowerStationMapper.updateById(workOrderPowerStation);
-		             LambdaUpdateWrapper<WorkOrder> upq=new LambdaUpdateWrapper();
-		             upq.eq(WorkOrder::getSequenceNbr,workOrderPowerStation.getWorkOrderId());
-		             upq.set(WorkOrder::getWorkOrderStatus,WorkOrderEnum.未通过
-		                     .getCode());
-		             workOrderMapper.update(null,upq);
+				LambdaUpdateWrapper<WorkOrder> upq = new LambdaUpdateWrapper();
+				upq.eq(WorkOrder::getSequenceNbr, workOrderPowerStation.getWorkOrderId());
+				upq.set(WorkOrder::getWorkOrderStatus, WorkOrderEnum.未通过.getCode());
+				workOrderMapper.update(null, upq);
 
 			}
 
-		        //增加操作日志
+			// 增加操作日志
 			constructionRecords.setWorkOrderId(workOrderPowerStation.getWorkOrderId());
-		        constructionRecords.setOperationContent("完工自审-"+constructionRecords.getOperationResults());
+			constructionRecords.setOperationContent("完工自审-" + constructionRecords.getOperationResults());
 			constructionRecords.setWorkOrderPowerStationId(workOrderPowerStation.getSequenceNbr());
 			constructionRecords.setPeasantHouseholdId(workOrderPowerStation.getPeasantHouseholdId());
 			constructionRecordsServiceImpl.save(constructionRecords);