Merge branch 'developer' of http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz into developer

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/WorkOrder.java

@@ -132,6 +132,15 @@ public class WorkOrder extends BaseEntity {
     private String amosDealerOrgCode;
 
 
+    @ApiModelProperty(value = "工程负责人userId")
+    @TableField("project_region_manager_user_id")
+    private String projectRegionManagerUserId;
+
+    @ApiModelProperty(value = "工程负责人userId")
+    @TableField("construction_region_manager_user_id")
+    private String constructionRegionManagerUserId;
+
+
 
 
 

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

@@ -25,9 +25,13 @@ public interface UnitInfoMapper extends BaseMapper<UnitInfo> {
     Map<String,Integer> getCompanyDtoCount(@Param("dto")CompanyDto dto);
     //List< Map<String,Object>> getuserList(@Param("userName") String userName,@Param("role") Long role,@Param("regionalCompaniesSeq") Long regionalCompaniesSeq,@Param("amosUnitId") Long amosUnitId);
     List< Map<String,Object>> getuserListByOrgCode(@Param("userName") String userName,@Param("role") Long role,@Param("regionalCompaniesSeq") Long regionalCompaniesSeq,@Param("amosOrgCode") String amosOrgCode);
+    List< Map<String,Object>> getuserListAllByOrgCode(@Param("userName") String userName,@Param("role") Long role,@Param("regionalCompaniesSeq") Long regionalCompaniesSeq,@Param("amosOrgCode") String amosOrgCode);
   @UserEmpower(field ={},dealerField ={"hygf_personnel_business.amos_unit_org_code","hygf_personnel_business.regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
   List< Map<String,Object>> getuserListtelephone(@Param("userName") String userName,@Param("role") Long role,@Param("regionalCompaniesSeq") Long regionalCompaniesSeq,@Param("amosUnitId") Long amosUnitId);
 
+
+    List< Map<String,Object>> getUserTelephoneByUserId(@Param("userId") String userId);
+
     @UserEmpower(field ={"hygf_regional_companies.regional_companies_code"} ,dealerField ={} ,fieldConditions ={"in"} ,relationship="and")
     List<UnitInfo>   getlistUnitInfo();
 
@@ -39,4 +43,6 @@ public interface UnitInfoMapper extends BaseMapper<UnitInfo> {
    Integer getUserListPauCount(String phone, String userName);
 
     Integer getUserListSubCount(String phone, String userName);
+
+    Integer getUserListAliCount(String phone, String userName);
 }

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.hygf.api.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.dto.WorkOrderPage;
+import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
 import com.yeejoin.amos.boot.module.hygf.api.entity.WorkOrder;
 import org.apache.ibatis.annotations.Param;
 
@@ -20,4 +21,5 @@ public interface WorkOrderMapper extends BaseMapper<WorkOrder> {
     @UserEmpower(field = {}, dealerField = {"hygf_work_order.amos_dealer_org_code","hygf_work_order.region_code","hygf_peasant_household.developer_user_id"}, fieldConditions = {"in", "in", "in"}, relationship = "and")
     List<WorkOrderPage> queryForwgpage(@Param("dto") WorkOrderPage dto);
 
+    String getRealNameByUserId(String userId);
 }

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

@@ -90,6 +90,32 @@ from  privilege_company  where IS_DELETED=0 and AGENCY_CODE='JXIOP'
 
     </select>
 
+    <select id="getuserListAllByOrgCode" resultType="Map">
+
+        select
+        std_user_biz.real_name realName,
+        std_user_biz.amos_user_id amosUserId
+        from
+        std_user_biz LEFT JOIN hygf_personnel_business on std_user_biz.sequence_nbr =hygf_personnel_business.foundation_id
+
+        <where>
+            <if test="role!=null">
+                and std_user_biz.role like concat(concat("%",#{role}),"%")
+            </if>
+            <if test="regionalCompaniesSeq!=null">
+                and hygf_personnel_business.regional_companies_seq=#{regionalCompaniesSeq}
+            </if>
+            <if test="amosOrgCode!=null">
+                and hygf_personnel_business.amos_unit_org_code like concat ('%',#{amosOrgCode},'%')
+            </if>
+            <if test="userName!=null">
+                and  std_user_biz.amos_user_id=#{userName}
+            </if>
+        </where>
+
+
+    </select>
+
 
     <select id="getuserListtelephone" resultType="Map">
 
@@ -117,6 +143,20 @@ from  privilege_company  where IS_DELETED=0 and AGENCY_CODE='JXIOP'
 
     </select>
 
+    <select id="getUserTelephoneByUserId" resultType="Map">
+        select
+        std_user_biz.emergency_telephone  emergencyTelephone
+        from
+        std_user_biz
+        <where>
+            <if test="userId!=null">
+                and  std_user_biz.amos_user_id=#{userId}
+            </if>
+        </where>
+        LIMIT 1
+
+    </select>
+
 
     <select id="getlistUnitInfo" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.UnitInfo">
 
@@ -165,4 +205,17 @@ from  privilege_company  where IS_DELETED=0 and AGENCY_CODE='JXIOP'
         </where>
     </select>
 
+    <select id="getUserListAliCount" resultType="integer">
+        select count(*) from auth_login_info
+        <where>
+            IS_DELETED = 0
+            <if test="phone != null and phone !=''">
+                and   LOGIN_ID = #{phone}
+            </if>
+            <if test="userName != null and userName !=''">
+                and  LOGIN_ID = #{userName}
+            </if>
+        </where>
+    </select>
+
 </mapper>

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

@@ -38,6 +38,16 @@
 
    </select>
 
+
+    <select id="getRealNameByUserId"  resultType="String" >
+        select real_name from std_user_biz where amos_user_id =#{userId}
+    </select>
+
+
+
+
+
+
     <select id="queryForwgpage"  resultType="com.yeejoin.amos.boot.module.hygf.api.dto.WorkOrderPage" >
 
         select

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

@@ -843,6 +843,22 @@ public ResponseModel< List<Map<String,Object>> > getRegionalCompanieByuser(
         List<Map<String,Object>>  date= unitInfoMapper.getuserListByOrgCode(null,role,regionalCompaniesSeq,userUnitInformationDto.getAmosDealerOrgCode());
         return ResponseHelper.buildResponse(date);
     }
+
+
+    /***获取经销商，区域公司下 工程负责人**/
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+    @GetMapping(value = "/getuserListAll")
+    public ResponseModel< List<Map<String,Object>> > getuserListAll( @RequestParam(required=false) Long role,
+                                                                  @RequestParam(required=false) Long regionalCompaniesSeq
+
+    ) {
+        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
+        List<Map<String,Object>>  date= unitInfoMapper.getuserListAllByOrgCode(null,role,regionalCompaniesSeq,userUnitInformationDto.getAmosDealerOrgCode());
+        return ResponseHelper.buildResponse(date);
+    }
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
     @GetMapping(value = "/getuserTelephone")
@@ -860,6 +876,22 @@ public ResponseModel< List<Map<String,Object>> > getRegionalCompanieByuser(
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET",value = "根据userId查询手机号",   notes = "根据userId查询手机号")
+    @GetMapping(value = "/getUserTelephoneByUserId")
+    public ResponseModel< Map<String,Object> > getUserTelephoneByUserId( @RequestParam(required=false) String userId
+    ) {      Map<String,Object> data=null;
+        if(StringUtils.isNotEmpty(userId)){
+            List<Map<String,Object>> date= unitInfoMapper.getUserTelephoneByUserId(userId);
+            if(date!=null&&!date.isEmpty()){
+                data=date.get(0);
+            }
+        }
+
+
+        return ResponseHelper.buildResponse(data);
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
     @GetMapping(value = "/selectPeasantHouseholdListsg")
     public ResponseModel<Page<PeasantHousehold>> selectPeasantHouseholdListsg(

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

@@ -103,7 +103,8 @@ public class WorkOrderController extends BaseController {
 	@GetMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个施工派工工单",  notes = "根据sequenceNbr查询单个施工派工工单")
 	public ResponseModel<WorkOrder> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(workOrderServiceImpl.selectOne(sequenceNbr));
+        WorkOrder workOrder = workOrderServiceImpl.selectOne(sequenceNbr);
+        return ResponseHelper.buildResponse(workOrder);
 	}
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

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

@@ -1076,12 +1076,13 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
         Integer userListHuiCount = unitInfoMapper.getUserListHuiCount(phone, userName);
         Integer userListPauCount = unitInfoMapper.getUserListPauCount(phone, userName);
         Integer userListSubCount = unitInfoMapper.getUserListSubCount(phone, userName);
+        Integer userListAliCount = unitInfoMapper.getUserListAliCount(phone, userName);
 
-        if((userListHuiCount != 0 || userListPauCount != 0 || userListSubCount != 0) && phone != null) {
+        if((userListHuiCount != 0 || userListPauCount != 0 || userListSubCount != 0 || userListAliCount !=0) && phone != null) {
             throw new BadRequest("该手机号已经注册");
         }
 
-        if((userListHuiCount != 0 || userListPauCount != 0 || userListSubCount != 0) && userName != null) {
+        if((userListHuiCount != 0 || userListPauCount != 0 || userListSubCount != 0 || userListAliCount !=0) && userName != null) {
             throw new BadRequest("该用户名已经注册");
         }
         return true;

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

@@ -144,6 +144,15 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		model.setAmosDealerName(userUnitInformationDto.getAmosDealerName());
 		model.setAmosDealerOrgCode(userUnitInformationDto.getAmosDealerOrgCode());
 
+		//        根据工程用户id, 查询用户姓名
+		String projectRegionManager = workOrderMapper.getRealNameByUserId(model.getProjectRegionManagerUserId());
+		String constructionRegionManager = workOrderMapper.getRealNameByUserId(model.getConstructionRegionManagerUserId());
+
+		model.setProjectRegionManager(projectRegionManager);
+		model.setConstructionRegionManager(constructionRegionManager);
+
+
+
 		workOrderMapper.insert(model);
 
 		// 保存派工单 电站信息
@@ -180,6 +189,13 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		model.setRegionCode(regionalCompanies.getRegionalCompaniesCode());
 		model.setWorkOrderStatus(WorkOrderEnum.待施工.getCode());
 		model.setRegionAddress(regionalCompanies.getRegionalAddress());
+		// 根据工程用户id, 查询用户姓名
+		String projectRegionManager = workOrderMapper.getRealNameByUserId(model.getProjectRegionManagerUserId());
+		String constructionRegionManager = workOrderMapper.getRealNameByUserId(model.getConstructionRegionManagerUserId());
+
+		model.setProjectRegionManager(projectRegionManager);
+		model.setConstructionRegionManager(constructionRegionManager);
+
 		// 获取经销商单位信息
 		model.setAmosDealerId(userUnitInformationDto.getAmosDealerId());
 		model.setAmosDealerName(userUnitInformationDto.getAmosDealerName());