修改运维管理bug

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

@@ -15,4 +15,6 @@ public interface HYGFMaintenanceTicketsMapper extends BaseMapper<HYGFMaintenance
     @Update("update hygf_maintenance_tickets SET score = #{score} WHERE sequence_nbr = #{sequenceNbr}")
     void updateScoreBySequenceNbr(String score,Long sequenceNbr);
     List<HYGFMaintenanceTicketsDto> qureyListByQueryparams(@Param("dto") HYGFMaintenanceTicketsDto dto ,@Param("amosUserId")String amosUserId);
+
+    List<HYGFMaintenanceTicketsDto> queryForPageList(@Param("dto") HYGFMaintenanceTicketsDto dto ,@Param("amosUserId")String amosUserId);
 }

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

@@ -16,5 +16,12 @@ public interface UserEmpowerMapper extends BaseMapper<StdUserEmpower> {
 
     List<Map<String,String>>  georgcodelist(@Param("orgs") List<String> orgs );
 
+    void upuserrole(
+            @Param("id") Long id,
+            @Param("userId") String userId,
+            @Param("role") Long role,
+            @Param("com") Long com
+
+    );
 
 }

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

@@ -23,4 +23,22 @@
         </where>
         order by hygf_maintenance_tickets.sequence_nbr desc
     </select>
+
+
+    <select id="queryForPageList" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.HYGFMaintenanceTicketsDto">
+        select hygf_maintenance_tickets.* from
+        hygf_maintenance_tickets
+
+        <where>
+            hygf_maintenance_tickets.creator_user_id =#{amosUserId}
+            and hygf_maintenance_tickets.warning_id =0
+            <if test="dto.handlerStatus != null and dto.handlerStatus !=''">
+                And hygf_maintenance_tickets.handler_status = #{dto.handlerStatus}
+            </if>
+            <if test="dto.stationName != null and dto.stationName !=''">
+                And hygf_maintenance_tickets.station_name LIKE CONCAT('%', #{dto.stationName}, '%')
+            </if>
+        </where>
+        order by hygf_maintenance_tickets.sequence_nbr desc
+    </select>
 </mapper>

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

@@ -14,5 +14,22 @@
         </if>
 
     </select>
+<insert id="upuserrole">
 
+INSERT INTO `amos_project`.`privilege_user_org_role` ( `SEQUENCE_NBR`, `REC_DATE`, `REC_USER_ID`, `USER_ID`,
+`COMPANY_SEQ`,
+`DEPARTMENT_SEQ`,
+`AGENCY_CODE`,
+ `ROLE_SEQ` )
+VALUES
+	( #{id},
+	sysdate(),
+	#{userId},
+	#{userId},
+	#{com},
+	 NULL,
+	'JXIOP',
+	#{role} );
+
+</insert>
 </mapper>

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

@@ -45,6 +45,19 @@ public class HYGFMaintenanceTicketsController extends BaseController {
 	    return ResponseHelper.buildResponse(model);
 	}
 
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @GetMapping(value = "/pageList")
+    @ApiOperation(httpMethod = "GET",value = "运维工单分页查询",  notes = "运维工单分页查询")
+    public ResponseModel<Page<HYGFMaintenanceTicketsDto>> queryForPageList(@RequestParam(value = "current") int current,
+                                                                           @RequestParam(value = "size") int size,
+                                                                           HYGFMaintenanceTicketsDto hygfMaintenanceTicketsDto) {
+        Page<HYGFMaintenanceTicketsDto> page=  hygfMaintenanceTicketsServiceimpl.queryForPageList(current,size,hygfMaintenanceTicketsDto);
+        return ResponseHelper.buildResponse(page);
+    }
+
+
+
 	/**
      * 根据sequenceNbr更新
      *

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

@@ -199,4 +199,19 @@ public class HYGFMaintenanceTicketsServiceImpl extends BaseService<HYGFMaintenan
         log.info("更新运维工单成功{}", JSON.toJSONString(hygfMaintenanceTicketsDto));
         return hygfMaintenanceTicketsDto;
     }
+
+
+
+    public Page<HYGFMaintenanceTicketsDto> queryForPageList(int current, int size, HYGFMaintenanceTicketsDto hygfMaintenanceTicketsDto) {
+        String amosUserId = RequestContext.getExeUserId();
+        PageHelper.startPage(current, size);
+        List<HYGFMaintenanceTicketsDto> hygfMaintenanceTicketsDtos = this.getBaseMapper().queryForPageList(hygfMaintenanceTicketsDto,amosUserId);
+        PageInfo<HYGFMaintenanceTicketsDto> page = new PageInfo<>(hygfMaintenanceTicketsDtos);
+        Page<HYGFMaintenanceTicketsDto> pageNew = new Page<>();
+        pageNew.setCurrent(current);
+        pageNew.setTotal(page.getTotal());
+        pageNew.setSize(size);
+        pageNew.setRecords(page.getList());
+        return pageNew;
+    }
 }

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

@@ -353,61 +353,91 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
         unitInfo.setAdminPhone(publicAgencyUse.getEmergencyTelephone());
         unitInfo.setAdminUserId(publicAgencyUse.getAmosUserId());
         unitInfo.setAdminUserName(publicAgencyUse.getRealName());
+        unitInfoMapper.updateById(unitInfo);
+        //修改管理员
+        List<Long>  roidx= JSONArray.parseArray(publicAgencyUsex.getRole(),Long.class);
+            if(roidx==null){
+                publicAgencyUsex.setRole(null);
+            }else{
+                roidx.remove(userGroupId);
+                publicAgencyUsex.setRole(JSON.toJSONString(roidx));
+            }
 
 
-        unitInfoMapper.updateById(unitInfo);
+        //修改当前用户角色权限
+        List<Long>  roid= JSONArray.parseArray(publicAgencyUse.getRole(),Long.class);
+        if(roid==null){
+            roid=new ArrayList<>();
+        }
+        roid.add(userGroupId);
+        publicAgencyUse.setRole(JSON.toJSONString(roid));
+
+        publicAgencyUserMapper.updateById(publicAgencyUsex);
+        publicAgencyUserMapper.updateById(publicAgencyUse);
 
+        //修改平台用户
         List<String> userId = new ArrayList<>();
         userId.add(publicAgencyUse.getAmosUserId());
 
-
-        //修改新管理员
+        // 1 修改平台用户
         Privilege.groupUserClient.create(userGroupId, userId);
 
+
+
+
+
         //删除旧管理员
         Privilege.groupUserClient.deleteGroupUser(userGroupId,publicAgencyUsex.getAmosUserId());
 
 
-            //修改权限
-            //旧管理员去除
-            List<String> li=null;
-            LambdaQueryWrapper<StdUserEmpower> uo=new LambdaQueryWrapper();
-            uo.eq(StdUserEmpower::getAmosUserId,publicAgencyUsex.getAmosUserId());
-            StdUserEmpower  stdUserEmpower= userEmpowerMapper.selectOne(uo);
-            li=stdUserEmpower.getAmosOrgCode();
+            userEmpowerMapper.upuserrole(
+                    publicAgencyUse.getSequenceNbr(),
+                    publicAgencyUse.getAmosUserId(),
+                    userGroupId,
+                    personnelBusines.getAmosUnitId()
+            );
 
-            if(stdUserEmpower!=null){
-                stdUserEmpower.setAmosOrgCode(null);
-                userEmpowerMapper.updateById(stdUserEmpower);
 
-            }else{
-                stdUserEmpower=new StdUserEmpower();
-                stdUserEmpower.setAmosOrgCode(null);
-                stdUserEmpower.setPermissionType("HYGF");
-                stdUserEmpower.setAmosUserId(publicAgencyUsex.getAmosUserId());
-                userEmpowerMapper.insert(stdUserEmpower);
-            }
+            //修改权限
+        //旧管理员去除
+        List<String> li=null;
+        LambdaQueryWrapper<StdUserEmpower> uo=new LambdaQueryWrapper();
+        uo.eq(StdUserEmpower::getAmosUserId,publicAgencyUsex.getAmosUserId());
+        StdUserEmpower  stdUserEmpower= userEmpowerMapper.selectOne(uo);
+        li=stdUserEmpower.getAmosOrgCode();
+
+        if(stdUserEmpower!=null){
+            stdUserEmpower.setAmosOrgCode(null);
+            userEmpowerMapper.updateById(stdUserEmpower);
+
+        }else{
+            stdUserEmpower=new StdUserEmpower();
+            stdUserEmpower.setAmosOrgCode(null);
+            stdUserEmpower.setPermissionType("HYGF");
+            stdUserEmpower.setAmosUserId(publicAgencyUsex.getAmosUserId());
+            userEmpowerMapper.insert(stdUserEmpower);
+        }
 
 
 
 
-           //新管理员新增
-            LambdaQueryWrapper<StdUserEmpower> uo1=new LambdaQueryWrapper();
-            uo1.eq(StdUserEmpower::getAmosUserId,publicAgencyUse.getAmosUserId());
-            StdUserEmpower  stdUserEmpower1= userEmpowerMapper.selectOne(uo1);
+       //新管理员新增
+        LambdaQueryWrapper<StdUserEmpower> uo1=new LambdaQueryWrapper();
+        uo1.eq(StdUserEmpower::getAmosUserId,publicAgencyUse.getAmosUserId());
+        StdUserEmpower  stdUserEmpower1= userEmpowerMapper.selectOne(uo1);
 
 
-            if(stdUserEmpower1!=null){
-                stdUserEmpower1.setAmosOrgCode(li);
-                userEmpowerMapper.updateById(stdUserEmpower1);
+        if(stdUserEmpower1!=null){
+            stdUserEmpower1.setAmosOrgCode(li);
+            userEmpowerMapper.updateById(stdUserEmpower1);
 
-            }else{
-                stdUserEmpower1=new StdUserEmpower();
-                stdUserEmpower1.setAmosOrgCode(li);
-                stdUserEmpower1.setPermissionType("HYGF");
-                stdUserEmpower1.setAmosUserId(publicAgencyUse.getAmosUserId());
-                userEmpowerMapper.insert(stdUserEmpower1);
-            }
+        }else{
+            stdUserEmpower1=new StdUserEmpower();
+            stdUserEmpower1.setAmosOrgCode(li);
+            stdUserEmpower1.setPermissionType("HYGF");
+            stdUserEmpower1.setAmosUserId(publicAgencyUse.getAmosUserId());
+            userEmpowerMapper.insert(stdUserEmpower1);
+        }