Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into zigonggao_dev
| | |
| | | @ApiOperation("根据部门id获取导办事物列表") |
| | | @GetMapping("/department/getList") |
| | | @Authorization |
| | | public TableDataInfo<TransactionEvent> selectConfigList(@RequestParam(value = "DepartmentId",required = false) String DepartmentId, |
| | | public TableDataInfo<TransactionEvent> selectConfigList(@RequestParam(value = "DepartmentId",required = false) List<String> DepartmentId, |
| | | @CurrentUser SysUser sysUser) |
| | | { |
| | | List<String> ids=iOrganizationChartService.getIds(DepartmentId); |
| | | List<TransactionEvent> list = iTransactionEventService.selectConfigList(null,null,ids); |
| | | int num=iTransactionEventService.countNum(null,null,ids); |
| | | // List<String> ids=iOrganizationChartService.getIds(DepartmentId); |
| | | List<TransactionEvent> list = iTransactionEventService.selectConfigList(null,null,DepartmentId); |
| | | int num=iTransactionEventService.countNum(null,null,DepartmentId); |
| | | return getDataTable(list,num); |
| | | } |
| | | |
| | |
| | | private String mattersIds; |
| | | |
| | | |
| | | @ApiModelProperty("部门ids") |
| | | private String departmentIds; |
| | | |
| | | |
| | | @TableField(exist = false) |
| | | @ApiModelProperty("办理事项名称") |
| | | private String mattersNames; |
| | |
| | | <result property="transactionNum" column="transaction_num" /> |
| | | <result property="isDivisionHead" column="is_division_head" /> |
| | | <result property="mattersIds" column="matters_ids" /> |
| | | <result property="departmentIds" column="department_ids" /> |
| | | </resultMap> |
| | | |
| | | <sql id="selectSysUserVo"> |
| | |
| | | stair_id, |
| | | second_level_id, |
| | | matters_ids, |
| | | department_ids, |
| | | (SELECT GROUP_CONCAT(matter_name) FROM automessage_transaction_event WHERE id in (SELECT |
| | | substring_index(substring_index(matters_ids,',', b.help_topic_id + 1), ',', -1) result |
| | | FROM |
| | |
| | | <if test="openid != null and openid != '' ">,openid</if> |
| | | <if test="isDivisionHead != null and isDivisionHead != '' ">,is_division_head</if> |
| | | <if test="mattersIds != null ">,matters_ids</if> |
| | | <if test="departmentIds != null ">,department_ids</if> |
| | | )values( |
| | | sysdate() |
| | | <if test="userId != null and userId != '' ">,#{userId}</if> |
| | |
| | | <if test="openid != null and openid != '' ">,#{openid}</if> |
| | | <if test="isDivisionHead != null and isDivisionHead != '' ">,#{isDivisionHead}</if> |
| | | <if test="mattersIds != null">,#{mattersIds}</if> |
| | | <if test="departmentIds != null ">,#{departmentIds}</if> |
| | | ) |
| | | </insert> |
| | | |
| | |
| | | <if test="openid != null and openid != '' ">,openid=#{openid}</if> |
| | | <if test="isDivisionHead != null and isDivisionHead != '' ">,is_division_head=#{isDivisionHead}</if> |
| | | <if test="mattersIds != null">,matters_ids=#{mattersIds}</if> |
| | | <if test="departmentIds != null ">,department_ids=#{departmentIds}</if> |
| | | ,update_time=sysdate() |
| | | </set> |
| | | where user_id= #{userId} |