修改人员模块

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/BusFormDto.java

@@ -169,7 +169,7 @@ public class BusFormDto  {
      * 报废类型（1销毁出库，2移入报废区）
      */
     private Integer type;
-   
+
     /**
      * 单据使用次数（forbidden禁止使用，outgoing 仅出库使用，incoming仅入库使用，bothuseing出入库都可以使用一次）
      */

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/PolicemanDto.java

@@ -27,10 +27,8 @@ public class PolicemanDto {
     private String tel;
 
     private String phone;
-    //单警柜编号
-    private String cabinetNum;
-    //单警柜主柜名
-    private String cabinetName;
+    //单警柜
+    private CabinetDto cabinetInfo;
     //组织机构名称
     private String orgName;
     //组织机构id
@@ -49,10 +47,12 @@ public class PolicemanDto {
     //用户名
     private String account;
 
-    /**
-     * 角色id列表
-     */
+//    /**
+//     * 角色id列表
+//     */
     private List<Long> rolesList;
+    private String rolesName;
+//    private List<SysUserRoleDto> rolesList;
     /**
      * 0警员，1辅警
      */
@@ -66,4 +66,9 @@ public class PolicemanDto {
      * 指纹照片list
      */
     private List<String> fingerList;
+
+    /**
+     * 海康人脸机
+     */
+    private Integer hkFaceDevice;
 }
\ No newline at end of file

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/SysUserRoleDto.java

+package com.junmp.jyzb.api.bean.dto;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+@Data
+public class SysUserRoleDto {
+    private Long userId;
+    private Long roleId;
+    private String roleName;
+    private String roleCode;
+    private Integer roleSort;
+    private Integer dataScopeType;
+    private Integer statusFlag;
+    private String remark;
+    private Integer delFlag;
+    private Integer roleSysFlag;
+    private String roleTypeCode;
+}

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/PolicemanReq.java

@@ -21,7 +21,7 @@ public class PolicemanReq extends BaseRequest {
     @NotBlank(message = "箱门id不能为空", groups = {edit.class, delete.class})
     private String cabinetBoxId;
 
-    @NotNull(message = "组织机构id不能为空",groups = {add.class})
+    @NotNull(message = "组织机构id不能为空",groups = {add.class,page.class})
     private Long orgId;
 
     private Long departmentId;

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdatePolicemanReq.java

@@ -80,5 +80,6 @@ public class UpdatePolicemanReq extends BaseRequest {
      * 指纹照片list
      */
     private List<String> fingerList;
+    private Long userId;
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/controller/PoliceController.java

@@ -105,7 +105,7 @@ public class PoliceController {
     //根据组条件查询,只查询本级，不包含下级(page)--可以根据组织机构查询
     @PostMapping("/ShowPolicePage")
     @ApiOperation("根据条件查询所有警员信息(page)")
-    public ApiRes<PageResult<PolicemanDto>> GetAllPolicemanPage(@RequestBody PolicemanReq req){
+    public ApiRes<PageResult<PolicemanDto>> GetAllPolicemanPage(@RequestBody @Validated(ValidationApi.page.class) PolicemanReq req){
         PageResult<PolicemanDto> policemanDtoPageResult = policemanService.GetAllPolicemanPage(req);
         return ApiRes.success(policemanDtoPageResult);
     }

jyzb-biz/src/main/java/com/junmp/jyzb/entity/Policeman.java

@@ -84,5 +84,11 @@ public class Policeman implements Serializable {
     @TableField(value = "identity")
     private Integer identity;
 
+    /**
+     * 海康人脸机
+     */
+    @TableField(value = "hk_face_device")
+    private Integer hkFaceDevice;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/PolicemanMapper.java

@@ -3,6 +3,8 @@ package com.junmp.jyzb.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.junmp.jyzb.api.bean.dto.PolicemanDto;
+import com.junmp.jyzb.api.bean.dto.SysUserRoleDto;
 import com.junmp.jyzb.api.bean.dto.UserRoleDto;
 import com.junmp.jyzb.entity.CabinetBox;
 import com.junmp.jyzb.entity.InventorySummary;
@@ -38,4 +40,9 @@ public interface PolicemanMapper extends BaseMapper<Policeman> {
     void updateBatchUserIdByAccountList(@Param("userIdList") List<Long> userIdList, @Param("accountList") List<String> accountList);
 
     List<UserRoleDto> ShowUserRole(@Param("req") SysUserReq req,@Param("numRoles") Integer numRoles);
+
+    List<SysUserRoleDto> selectUserRoleInfo(@Param("userId") Long userId);
+
+
+    List<PolicemanDto> selectUserBypoliceIds(Long orgId, String account, String name, String policeCode, String phone, long l, Long pageSize);
 }
\ No newline at end of file

jyzb-biz/src/main/resources/mapper/PolicemanMapper.xml

@@ -242,5 +242,13 @@ WHERE o.org_id IN
             order by s1.create_time desc
         </where>
     </select>
+    <select id="selectUserRoleInfo" resultType="com.junmp.jyzb.api.bean.dto.SysUserRoleDto">
+        select su.user_id as user_id,sr.* FROM sys_user su
+                                                   join sys_user_role sur on sur.user_id=su.user_id
+                                                   join sys_role sr on sur.role_id=sr.role_id
+        WHERE su.user_id=#{userId}
+    </select>
+
+
 
 </mapper>
\ No newline at end of file

jyzb-process/src/main/java/com/junmp/junmpProcess/service/IFlowInstanceService.java

@@ -4,6 +4,7 @@ import com.junmp.junmpProcess.dto.StartProcessInstanceDTO;
 import com.junmp.v2.common.bean.response.ApiRes;
 import org.flowable.engine.history.HistoricProcessInstance;
 
+import java.util.List;
 import java.util.Map;
 
 public interface IFlowInstanceService {

jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowInstanceServiceImpl.java

@@ -207,6 +207,10 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow
         //手动完成第一个任务
 
     }
+
+
+
+
     // 递归获取异常信息的方法
     private String getFullErrorMessage(Throwable throwable) {
         StringBuilder errorMessage = new StringBuilder();

jyzb-process/src/main/java/com/junmp/junmpProcess/utils/BpmnConvert.java

@@ -204,7 +204,7 @@ public class BpmnConvert {
         multiInstanceLoopCharacteristics.setElementVariable("assigneeName");
         // 串行
         multiInstanceLoopCharacteristics.setSequential(false);
-        multiInstanceLoopCharacteristics.setCompletionCondition("${nrOfCompletedInstances/nrOfInstances > 0}");
+        multiInstanceLoopCharacteristics.setCompletionCondition("${nrOfCompletedInstances/nrOfInstances >=1}");
         userTask.setAssignee("${assigneeName}");
 //         设置多实例属性
         userTask.setLoopCharacteristics(multiInstanceLoopCharacteristics);