flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
@@ -210,7 +210,10 @@ if (config.getMoreDepartmentIds()!=null&&config.getMoreDepartmentIds().indexOf(",")>0) config.setDataPermission(config.getMoreDepartmentIds().substring(config.getMoreDepartmentIds().indexOf(",")+1)); else { config.setDataPermission("0"); } config.setRoleIds("13"); } else flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -59,7 +59,7 @@ List<HuaChengSysUser> list=iHuaChengSysUserService.selectData("",account,""); HuaChengSysUser huaChengSysUser=null; if(list!=null || list.size()>0 ) if(list!=null && list.size()>0 ) { huaChengSysUser=list.get(0); } @@ -250,6 +250,12 @@ config.setUserType("3"); config.setIsDivisionHead("1"); config.setUpdateTime(LocalDateTime.now()); config.setMasterIds(user2.getMasterIds()); config.setDepartmentIds(config.getDepartmentIds()); config.setDepartmentIdStr(config.getDepartmentIdStr()); config.setMattersIds(config.getMattersIds()); config.setMasterNames(config.getMasterNames()); config.setMattersNames(config.getMattersNames()); return toAjax(IUserService.updateConfig(config)); } else @@ -268,6 +274,12 @@ config.setUserType("3"); config.setIsDivisionHead("1"); config.setUpdateTime(LocalDateTime.now()); config.setMasterIds(user2.getMasterIds()); config.setDepartmentIds(config.getDepartmentIds()); config.setDepartmentIdStr(config.getDepartmentIdStr()); config.setMattersIds(config.getMattersIds()); config.setMasterNames(config.getMasterNames()); config.setMattersNames(config.getMattersNames()); return toAjax(IUserService.updateConfig(config)); } else @@ -281,7 +293,7 @@ config.setUserId(Snowflake.getId()+""); config.setUserType("3"); config.setIsDivisionHead("1"); config.setMoreDepartmentIds(config.getDepartmentId()); config.setCreateTime(LocalDateTime.now()); config.setUpdateTime(LocalDateTime.now()); @@ -308,7 +320,7 @@ { return error("账户不能为空"); } config.setPassword(null); config.setUpdateBy(sys.getUserId()+""); return toAjax(IUserService.updateConfig(config)); flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java
@@ -81,7 +81,7 @@ * 导办数量 */ @ApiModelProperty("导办数量") private Integer transactionNum=0; private Integer transactionNum; /** * 浏览数量 flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
@@ -378,7 +378,10 @@ //删除进展记录 guideEvolveMapper.delete(new QueryWrapper<GuideEvolveEntity>().lambda().eq(GuideEvolveEntity::getGuideId, Id)); TransactionEvent transactionEvent = transactionEventMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().eq(TransactionEvent::getId, guideRepairOrderDelete.getMatterId())); transactionEvent.setTransactionNum(transactionEvent.getTransactionNum() - 1); if (transactionEvent.getTransactionNum()>0) { transactionEvent.setTransactionNum(transactionEvent.getTransactionNum() - 1); } //对应办事指南减一 transactionEventMapper.updateById(transactionEvent); SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, guideRepairOrderDelete.getGuideUserId())); flower_city/src/main/resources/mapper/SysUserMapper.xml
@@ -108,7 +108,13 @@ automessage_guide_repair_order.guide_department_id=automessage_sys_user.department_id) as transactionEndNum, (select role_name from automessage_role_management where automessage_role_management.id=role_ids) as roleName, (select permission from automessage_role_management where automessage_role_management.id=role_ids) as permission, (SELECT organization_name FROM automessage_organization_chart WHERE automessage_organization_chart.id=department_id) as department_name (SELECT GROUP_CONCAT(organization_name) FROM automessage_organization_chart WHERE id in (SELECT substring_index(substring_index(more_department_ids,',', b.help_topic_id + 1), ',', -1) result FROM mysql.help_topic b where b.help_topic_id < (LENGTH(more_department_ids) - LENGTH(REPLACE(more_department_ids, ',', '')) + 1))) as department_name FROM automessage_sys_user </sql> @@ -156,11 +162,12 @@ AND user_type=#{userType} </if> <if test="ids != null"> and department_id IN <foreach collection="ids" item="param" open="(" close=")" separator=","> #{param} AND <foreach collection="ids" item="param" open="(" close=")" separator="or"> locate(#{param},more_department_ids)>0 </foreach> </if> <if test="isDivisionHead != null and isDivisionHead != ''"> and is_division_head=#{isDivisionHead} </if> springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
@@ -1124,13 +1124,13 @@ Integer centerCount=comEventMapper.expertSolveCountCenter(); for (EventRateVO eventRateVO : eventRateVOS) { if (nonNull(eventRateVO)){ eventRateVO.setName(typeToName(eventRateVO.getCurrentProcessType())); if (eventRateVO.getCurrentProcessType().equals(2)){ eventRateVO.setCount(eventRateVO.getCount()+expertCount); } if (eventRateVO.getCurrentProcessType().equals(1)){ eventRateVO.setCount(eventRateVO.getCount()+centerCount); } eventRateVO.setName(typeToName(eventRateVO.getType())); // if (eventRateVO.getCurrentProcessType().equals(2)){ // eventRateVO.setCount(eventRateVO.getCount()+expertCount); // } // if (eventRateVO.getCurrentProcessType().equals(1)){ // eventRateVO.setCount(eventRateVO.getCount()+centerCount); // } if (nonNull(eventCount) && !eventCount.equals(0)){ //计算占比 eventRateVO.setRate(NumberUtil.div(eventRateVO.getCount(),eventCount,2)); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventMapper.xml
@@ -557,11 +557,11 @@ </if> </select> <select id="eventRate" resultType="com.panzhihua.common.model.vos.sanshuo.EventRateVO"> select count(id) as count,current_process_type from com_sanshuo_event_info select count(id) as count,type from com_sanshuo_event_info where event_process_status not in(7,8,9) AND app_id='wx0cef797390444b75' group by current_process_type having current_process_type not in (5) group by type having type not in (5) </select> <select id="expertRate" resultType="com.panzhihua.common.model.vos.sanshuo.EventRateVO"> select count(id) as count,level as type from com_sanshuo_expert where app_id='wx0cef797390444b75'
