From 06bd2c90749a94ebc49d477e0476de38517acf3a Mon Sep 17 00:00:00 2001 From: guoyuepeng Date: Thu, 28 Dec 2023 10:43:24 +0800 Subject: [PATCH 01/64] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E6=9B=B4=E6=96=B0.m?= =?UTF-8?q?d?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 更新.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 更新.md diff --git a/更新.md b/更新.md new file mode 100644 index 00000000..f6c918f8 --- /dev/null +++ b/更新.md @@ -0,0 +1 @@ +升级内容： 企业端PC： 1、新增-三人以上风险分布图菜单-分公司进行上传维护 2、新增-人员聚集分布图菜单-分公司进行上传维护 3、新增-人员培训申请-分公司进行申请培训 4、新增-相关方人员撤场申请审批-分公司审批相关方人员撤回申请 监管端PC： 1、新增-三人以上风险分布图菜单，查看分公司数据 2、新增-人员聚集分布图菜单，查看分公司数据 3、优化-重点工程菜单-搜索条件可以手动输入,主管部门和监管部门可以选择全部企业 4、优化-入场告知培训管理-优化审核流程 相关方PC： 1、新增-人员推送申请-相关方对分公司推送人员 2、新增-人员撤回申请-相关方对分公司申请撤回人员 企业端APP： 1、优化-动火作业-监火改为选择部门 2、新增-查看重点工程监控视频 3、新增-重点工程创建人审核开工申请和结束申请 监管端APP： 1、新增-查看重点工程监控视频 2、新增-重点工程创建人审核开工申请和结束申请 一公司app： 1、新增-原来动火作业改为国标新动火作业审批流程 \ No newline at end of file From 939ebb093adeb9d4ab2d84adaab2ac63552cf72b Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 11 Jan 2024 14:06:40 +0800 Subject: [PATCH 02/64] =?UTF-8?q?=E5=9C=B0=E5=9B=BEapplication=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.properties | 2 ++ src/main/resources/application-local.properties | 8 +++++--- src/main/resources/application-master.properties | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 1bf34f5d..a4dd85c3 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -96,3 +96,5 @@ mq.gwj.data.topic=czks_qy_docking mq.gwj.file.topic=czks_qy_dockingPicture #港务局文件服务器前缀 baseimgpath=https://qgqy.qhdsafety.com/file/ + +cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties index b0929eb4..483396e2 100644 --- a/src/main/resources/application-local.properties +++ b/src/main/resources/application-local.properties @@ -95,12 +95,14 @@ corp.default.back-end-path=https://qgqy.qhdsafety.com/file/ http.file.url=https://qgqy.qhdsafety.com/file/ -#ûʶ -# ݿʯ +#�û���ʶ +# ���ݿ�ʯ czks-useridentity=CZKS czks-baseimgpath=https://wwag.qhdsafety.com/file/ czks-backendaddr=http://192.168.0.79:8091/ -# +# ����� gwj-useridentity=GWJ gwj-baseimgpath=https://qgqy.qhdsafety.com/file/ gwj-backendaddr=http://192.168.0.31:8991/qa-prevention-gwj/ + +cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd diff --git a/src/main/resources/application-master.properties b/src/main/resources/application-master.properties index d4811098..4ebd818f 100644 --- a/src/main/resources/application-master.properties +++ b/src/main/resources/application-master.properties @@ -92,3 +92,5 @@ mq.gwj.data.topic=czks_docking mq.gwj.file.topic=czks_dockingPicture #港务局文件服务器前缀 baseimgpath=https://qgqy.qhdsafety.com/file/ + +cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd From 722aaee5e0b0e9c38dc02704ecdbc9a6f19fefa0 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Thu, 11 Jan 2024 15:49:30 +0800 Subject: [PATCH 03/64] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/highriskwork/HotWorkApplicationMapper.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml index a87579fb..038b8435 100644 --- a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml +++ b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml @@ -275,6 +275,9 @@ and (f.JOB_NUMBER LIKE CONCAT(CONCAT('%', #{pd.keyJobNumber}),'%')) + + and (u.NAME LIKE CONCAT(CONCAT('%', #{pd.applicantName}),'%')) + @@ -291,10 +294,10 @@ and f.STATE = #{pd.keyState} - and f.HOTWORKAPPLICATION_ID in (select FOREIGN_KEY from bus_hotworkapplicationuser houtUser LEFT JOIN sus_user u on u.user_id = houtUser.USER_ID where u.USERNAME = CONCAT(CONCAT('%', #{pd.keyApplyUserName}),'%') and STATE = '11') + and f.HOTWORKAPPLICATION_ID in (select FOREIGN_KEY from bus_hotworkapplicationuser houtUser LEFT JOIN vi_user_all u on u.user_id = houtUser.USER_ID where u.USERNAME = CONCAT(CONCAT('%', #{pd.keyApplyUserName}),'%') and STATE = '11') - and f.HOTWORKAPPLICATION_ID in (select FOREIGN_KEY from bus_hotworkapplicationuser houtUser LEFT JOIN sus_user u on u.user_id = houtUser.USER_ID where u.USERNAME = CONCAT(CONCAT('%', #{pd.keyApproveUserName}),'%') and STATE = '12') + and f.HOTWORKAPPLICATION_ID in (select FOREIGN_KEY from bus_hotworkapplicationuser houtUser LEFT JOIN vi_user_all u on u.user_id = houtUser.USER_ID where u.USERNAME = CONCAT(CONCAT('%', #{pd.keyApproveUserName}),'%') and STATE = '12') From 153916351542d7b43d08d286537c89ad701c6896 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Thu, 11 Jan 2024 18:02:12 +0800 Subject: [PATCH 04/64] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9A=90=E6=82=A3?= =?UTF-8?q?=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/dsno2/keyProjects/OutSourcedMapper.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml index 963cb222..b282d600 100644 --- a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml +++ b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml @@ -301,7 +301,8 @@ (SELECT count( 1 ) FROM `qa-gwj-prevention`.BUS_KEYPROJECTPUNISH k left join `qa-gwj-prevention`.bus_keyprojectcheck kjc on kjc.KEYPROJECTCHECK_ID = k.KEYPROJECTCHECK_ID WHERE kjc.OUTSOURCED_ID =f.OUTSOURCED_ID AND k.ISDELETE = '0' ) as KEY_COUNT, vua.NAME OUTSOURCED_CREATOR_NAME, ifnull(vac.CORP_NAME,'秦港股份有限公司') CORP_NAME, - p.`NAME` as UNITS_PIC_NAME + p.`NAME` as UNITS_PIC_NAME, + ifnull(h.HIDDEN_COUNT,0) HIDDEN_COUNT from f left join bus_units b using (UNITS_ID) @@ -313,6 +314,9 @@ LEFT JOIN `qa-gwj-regulatory`.vi_all_corp vac on vua.CORPINFO_ID = vac.CORPINFO_ID left join `qa-gwj-regulatory`.bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC LEFT JOIN ( select count(c.KEYPROJECTCHECK_ID) co, c.OUTSOURCED_ID from `qa-gwj-prevention`.BUS_KEYPROJECTCHECK c where c.ISDELETE = '0' group by c.OUTSOURCED_ID ) cc on cc.OUTSOURCED_ID = f.OUTSOURCED_ID + left join ( SELECT t.OUTSOURCED_ID, COUNT( t.HIDDEN_ID ) HIDDEN_COUNT + FROM + ( SELECT IFNULL( k.OUTSOURCED_ID, h.FOREIGN_ID ) OUTSOURCED_ID, h.* FROM `qa-gwj-prevention`.bus_keyproject_hidden h LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck k ON h.FOREIGN_ID = k.KEYPROJECTCHECK_ID ) t GROUP BY t.OUTSOURCED_ID ) h on h.OUTSOURCED_ID = f.OUTSOURCED_ID where f.ISDELETE = '0' and From 5e9aaf7bdd7a3d1a82af8d7c0c6b1f431d041a01 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Wed, 17 Jan 2024 14:46:28 +0800 Subject: [PATCH 05/64] =?UTF-8?q?=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/mkmj/MkmjAreaController.java | 121 +++++++++++ .../mkmj/MkmjAreaGateController.java | 122 +++++++++++ .../datasource/mkmj/MkmjAreaGateMapper.java | 65 ++++++ .../datasource/mkmj/MkmjAreaMapper.java | 73 +++++++ .../datasource/mkmj/MkmjGateLogMapper.java | 59 ++++++ .../service/mkmj/MkmjAreaGateService.java | 60 ++++++ .../zcloud/service/mkmj/MkmjAreaService.java | 55 +++++ .../mkmj/impl/MkmjAreaGateServiceImpl.java | 109 ++++++++++ .../mkmj/impl/MkmjAreaServiceImpl.java | 110 ++++++++++ .../datasource/mkmj/MkmjAreaGateMapper.xml | 192 ++++++++++++++++++ .../datasource/mkmj/MkmjAreaMapper.xml | 186 +++++++++++++++++ 11 files changed, 1152 insertions(+) create mode 100644 src/main/java/com/zcloud/controller/mkmj/MkmjAreaController.java create mode 100644 src/main/java/com/zcloud/controller/mkmj/MkmjAreaGateController.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjAreaGateMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjAreaMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjGateLogMapper.java create mode 100644 src/main/java/com/zcloud/service/mkmj/MkmjAreaGateService.java create mode 100644 src/main/java/com/zcloud/service/mkmj/MkmjAreaService.java create mode 100644 src/main/java/com/zcloud/service/mkmj/impl/MkmjAreaGateServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/mkmj/impl/MkmjAreaServiceImpl.java create mode 100644 src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml create mode 100644 src/main/resources/mybatis/datasource/mkmj/MkmjAreaMapper.xml diff --git a/src/main/java/com/zcloud/controller/mkmj/MkmjAreaController.java b/src/main/java/com/zcloud/controller/mkmj/MkmjAreaController.java new file mode 100644 index 00000000..76545288 --- /dev/null +++ b/src/main/java/com/zcloud/controller/mkmj/MkmjAreaController.java @@ -0,0 +1,121 @@ +package com.zcloud.controller.mkmj; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.map.util.ReturnMap; +import com.zcloud.service.mkmj.MkmjAreaService; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.ObjectExcelView; +import com.zcloud.util.Tools; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.ModelAndView; + +import java.util.*; + +/** + * 说明：门口门禁区域 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/mkmjArea") +public class MkmjAreaController extends BaseController { + + @Autowired + private MkmjAreaService mkmjAreaService; + + /**新增 + * @param + * @throws Exception + */ + @RequestMapping(value="/add") + @RequiresPermissions("mkmjArea:add") + @ResponseBody + public ReturnMap add() throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 添加时间 + pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 添加人 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 添加时间 + pd.put("ISDELETE", "0"); //是否删除 + pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date()));//修改时间 + return mkmjAreaService.save(pd); + } + + /**删除 + * @param + * @throws Exception + */ + @RequestMapping(value="/delete") + @RequiresPermissions("mkmjArea:del") + @ResponseBody + public ReturnMap delete() throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + return mkmjAreaService.delete(pd); + } + + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/edit") + @RequiresPermissions("mkmjArea:edit") + @ResponseBody + public ReturnMap edit() throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date()));//修改时间 + return mkmjAreaService.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/list") + @RequiresPermissions("mkmjArea:list") + @ResponseBody + public Object list(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + page.setPd(pd); + List varList = mkmjAreaService.list(page); //列出Coursectk列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /**去修改页面获取数据 + * @param + * @throws Exception + */ + @RequestMapping(value="/goEdit") + @RequiresPermissions("mkmjArea:edit") + @ResponseBody + public Object goEdit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = mkmjAreaService.findById(pd); //根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + +} diff --git a/src/main/java/com/zcloud/controller/mkmj/MkmjAreaGateController.java b/src/main/java/com/zcloud/controller/mkmj/MkmjAreaGateController.java new file mode 100644 index 00000000..5fb3fa82 --- /dev/null +++ b/src/main/java/com/zcloud/controller/mkmj/MkmjAreaGateController.java @@ -0,0 +1,122 @@ +package com.zcloud.controller.mkmj; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.map.util.ReturnMap; +import com.zcloud.service.mkmj.MkmjAreaGateService; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.Tools; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：门口门禁区域 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/mkmjAreaGate") +public class MkmjAreaGateController extends BaseController { + + @Autowired + private MkmjAreaGateService mkmjAreaGateService; + + /**新增 + * @param + * @throws Exception + */ + @RequestMapping(value="/add") + @RequiresPermissions("mkmjAreaGate:add") + @ResponseBody + public ReturnMap add() throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 添加时间 + pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 添加人 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 添加时间 + pd.put("ISDELETE", "0"); //是否删除 + pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date()));//修改时间 + return mkmjAreaGateService.save(pd); + } + + /**删除 + * @param + * @throws Exception + */ + @RequestMapping(value="/delete") + @RequiresPermissions("mkmjAreaGate:del") + @ResponseBody + public ReturnMap delete() throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + return mkmjAreaGateService.delete(pd); + } + + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/edit") + @RequiresPermissions("mkmjAreaGate:edit") + @ResponseBody + public ReturnMap edit() throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date()));//修改时间 + return mkmjAreaGateService.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/list") + @RequiresPermissions("mkmjAreaGate:list") + @ResponseBody + public Object list(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + page.setPd(pd); + List varList = mkmjAreaGateService.list(page); //列出Coursectk列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /**去修改页面获取数据 + * @param + * @throws Exception + */ + @RequestMapping(value="/goEdit") + @RequiresPermissions("mkmjAreaGate:edit") + @ResponseBody + public Object goEdit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = mkmjAreaGateService.findById(pd); //根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + +} diff --git a/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjAreaGateMapper.java b/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjAreaGateMapper.java new file mode 100644 index 00000000..6256a6e9 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjAreaGateMapper.java @@ -0,0 +1,65 @@ +package com.zcloud.mapper.datasource.mkmj; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：门口门禁区域闸机 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +public interface MkmjAreaGateMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + + /**. + * 校验名称是否重复 修改时传入数据id + * @param pageData + * @return + */ + PageData findByOnly(PageData pageData); +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjAreaMapper.java b/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjAreaMapper.java new file mode 100644 index 00000000..24fdc4bb --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjAreaMapper.java @@ -0,0 +1,73 @@ +package com.zcloud.mapper.datasource.mkmj; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：门口门禁区域 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +public interface MkmjAreaMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + + /**. + * 校验名称是否重复 修改时传入数据id + * @param pageData + * @return + */ + PageData findByOnly(PageData pageData); + + /** + * 检验是否存在下级区域 + * @param pd + * @return + */ + List findByChild(PageData pd); + +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjGateLogMapper.java b/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjGateLogMapper.java new file mode 100644 index 00000000..de486709 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjGateLogMapper.java @@ -0,0 +1,59 @@ +package com.zcloud.mapper.datasource.mkmj; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：门口门禁闸机出入记录 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +public interface MkmjGateLogMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + +} + diff --git a/src/main/java/com/zcloud/service/mkmj/MkmjAreaGateService.java b/src/main/java/com/zcloud/service/mkmj/MkmjAreaGateService.java new file mode 100644 index 00000000..99a3c9c7 --- /dev/null +++ b/src/main/java/com/zcloud/service/mkmj/MkmjAreaGateService.java @@ -0,0 +1,60 @@ +package com.zcloud.service.mkmj; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.map.util.ReturnMap; + +import java.util.List; + +/** + * 说明：门口门禁区域闸机 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +public interface MkmjAreaGateService { + + /**新增 + * @param pd + * @throws Exception + */ + public ReturnMap save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public ReturnMap delete(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public ReturnMap edit(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public ReturnMap deleteAll(String[] ArrayDATA_IDS)throws Exception; + +} + diff --git a/src/main/java/com/zcloud/service/mkmj/MkmjAreaService.java b/src/main/java/com/zcloud/service/mkmj/MkmjAreaService.java new file mode 100644 index 00000000..6834d684 --- /dev/null +++ b/src/main/java/com/zcloud/service/mkmj/MkmjAreaService.java @@ -0,0 +1,55 @@ +package com.zcloud.service.mkmj; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.map.util.ReturnMap; + +import java.util.List; + +/** + * 说明：门口门禁区域闸机 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +public interface MkmjAreaService { + + /**新增 + * @param pd + * @throws Exception + */ + public ReturnMap save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public ReturnMap delete(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public ReturnMap edit(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + +} + diff --git a/src/main/java/com/zcloud/service/mkmj/impl/MkmjAreaGateServiceImpl.java b/src/main/java/com/zcloud/service/mkmj/impl/MkmjAreaGateServiceImpl.java new file mode 100644 index 00000000..ec5d53cc --- /dev/null +++ b/src/main/java/com/zcloud/service/mkmj/impl/MkmjAreaGateServiceImpl.java @@ -0,0 +1,109 @@ +package com.zcloud.service.mkmj.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.mkmj.MkmjAreaGateMapper; +import com.zcloud.service.map.util.ReturnMap; +import com.zcloud.service.mkmj.MkmjAreaGateService; +import com.zcloud.util.UuidUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; + +import java.util.List; + +/** + * 说明：门口门禁区域闸机 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class MkmjAreaGateServiceImpl implements MkmjAreaGateService { + + @Autowired + private MkmjAreaGateMapper mkmjAreaGateMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public ReturnMap save(PageData pd)throws Exception{ + ReturnMap returnMap = new ReturnMap(); + //保存校验名称不重复 + PageData pageData = mkmjAreaGateMapper.findByOnly(pd); + //查询不到重复数据 开始走业务 + if(ObjectUtils.isEmpty(pageData)){ + pd.put("AREA_GATE_ID", UuidUtil.get32UUID()); + }else { + returnMap.error("名称已存在，请修改后重新提交"); + return returnMap; + } + mkmjAreaGateMapper.save(pd); + return returnMap.ok("保存成功"); + } + + /**删除 + * @param pd + * @throws Exception + */ + public ReturnMap delete(PageData pd)throws Exception{ + ReturnMap returnMap = new ReturnMap(); + mkmjAreaGateMapper.delete(pd); + return returnMap.ok("删除成功"); + } + + /**修改 + * @param pd + * @throws Exception + */ + public ReturnMap edit(PageData pd)throws Exception{ + ReturnMap returnMap = new ReturnMap(); + PageData pageData = mkmjAreaGateMapper.findByOnly(pd); + //查询不到重复数据 开始走业务 + if(!ObjectUtils.isEmpty(pageData)){ + returnMap.error("名称已存在，请修改后重新提交"); + return returnMap; + } + mkmjAreaGateMapper.edit(pd); + return returnMap.ok("编辑成功"); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return mkmjAreaGateMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return mkmjAreaGateMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return mkmjAreaGateMapper.findById(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public ReturnMap deleteAll(String[] ArrayDATA_IDS)throws Exception{ + ReturnMap returnMap = new ReturnMap(); + mkmjAreaGateMapper.deleteAll(ArrayDATA_IDS); + return returnMap.ok("删除成功"); + } + +} + diff --git a/src/main/java/com/zcloud/service/mkmj/impl/MkmjAreaServiceImpl.java b/src/main/java/com/zcloud/service/mkmj/impl/MkmjAreaServiceImpl.java new file mode 100644 index 00000000..18becb33 --- /dev/null +++ b/src/main/java/com/zcloud/service/mkmj/impl/MkmjAreaServiceImpl.java @@ -0,0 +1,110 @@ +package com.zcloud.service.mkmj.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.mkmj.MkmjAreaGateMapper; +import com.zcloud.mapper.datasource.mkmj.MkmjAreaMapper; +import com.zcloud.service.map.util.ReturnMap; +import com.zcloud.service.mkmj.MkmjAreaService; +import com.zcloud.util.UuidUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; + +import java.util.List; + +/** + * 说明：门口门禁区域闸机 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class MkmjAreaServiceImpl implements MkmjAreaService { + + @Autowired + private MkmjAreaMapper mkmjAreaMapper; + + @Autowired + private MkmjAreaGateMapper mkmjAreaGateMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public ReturnMap save(PageData pd)throws Exception{ + //保存校验名称不重复 + PageData pageData = mkmjAreaMapper.findByOnly(pd); + //查询不到重复数据 开始走业务 + if(ObjectUtils.isEmpty(pageData)){ + pd.put("AREA_ID", UuidUtil.get32UUID()); + }else { + return ReturnMap.error("名称已存在，请修改后重新提交"); + } + mkmjAreaMapper.save(pd); + return ReturnMap.ok("保存成功"); + } + + /**删除 + * @param pd + * @throws Exception + */ + public ReturnMap delete(PageData pd)throws Exception{ + //校验区域下是否还存在区域 存在则不让删除 + List childList = mkmjAreaMapper.findByChild(pd); + if(childList.size()>0){ + return ReturnMap.error("当前区域还存在下级区域，请删除当前区域的所有下级区域后进行删除"); + } + //校验区域下是否存在闸机，存在则不让删除 + List gateList = mkmjAreaGateMapper.listAll(pd); + if(gateList.size()>0){ + return ReturnMap.error("当前区域还存在闸机，请删除当前区域的所有闸机后进行删除"); + } + //两个校验都不存在 则可以删除 + mkmjAreaMapper.delete(pd); + return ReturnMap.ok("删除成功"); + } + + /**修改 + * @param pd + * @throws Exception + */ + public ReturnMap edit(PageData pd)throws Exception{ + PageData pageData = mkmjAreaMapper.findByOnly(pd); + //查询不到重复数据 开始走业务 + if(!ObjectUtils.isEmpty(pageData)){ + return ReturnMap.error("名称已存在，请修改后重新提交"); + } + mkmjAreaMapper.edit(pd); + return ReturnMap.ok("编辑成功"); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return mkmjAreaMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return mkmjAreaMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return mkmjAreaMapper.findById(pd); + } + + +} + diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml new file mode 100644 index 00000000..748585af --- /dev/null +++ b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml @@ -0,0 +1,192 @@ + + + + + + + MKMJ_AREA_GATE + + + + + SYS_DICTIONARIES + + + + + f.AREA_GATE_ID, + f.GATE_NUMBER, + f.AREA_ID, + f.GATE_NAME, + f.GATE_TYPE, + f.GATE_MODEL, + f.GATE_POSITION, + f.IS_ADJACENT, + f.ADJACENT_AREA_ID, + f.LONGITUDE, + f.LATITUDE, + f.CORPINFO_ID, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.ISDELETE + + + + + AREA_GATE_ID, + GATE_NUMBER, + AREA_ID, + GATE_NAME, + GATE_TYPE, + GATE_MODEL, + GATE_POSITION, + IS_ADJACENT, + ADJACENT_AREA_ID, + LONGITUDE, + LATITUDE, + CORPINFO_ID, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, + ISDELETE + + + + + #{AREA_GATE_ID}, + #{GATE_NUMBER}, + #{AREA_ID}, + #{GATE_NAME}, + #{GATE_TYPE}, + #{GATE_MODEL}, + #{GATE_POSITION}, + #{IS_ADJACENT}, + #{ADJACENT_AREA_ID}, + #{LONGITUDE}, + #{LATITUDE}, + #{CORPINFO_ID}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{ISDELETE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + AREA_GATE_ID = #{AREA_GATE_ID} + + + + + update + + set + AREA_GATE_ID= AREA_GATE_ID + GATE_NUMBER=#{GATE_NUMBER}, + AREA_ID=#{AREA_ID}, + GATE_NAME=#{GATE_NAME}, + GATE_TYPE=#{GATE_TYPE}, + GATE_MODEL=#{GATE_MODEL}, + GATE_POSITION=#{GATE_POSITION}, + IS_ADJACENT=#{IS_ADJACENT}, + ADJACENT_AREA_ID=#{ADJACENT_AREA_ID}, + LONGITUDE=#{LONGITUDE}, + LATITUDE=#{LATITUDE}, + CORPINFO_ID=#{CORPINFO_ID}, + CREATOR=#{CREATOR}, + CREATTIME=#{CREATTIME}, + OPERATOR=#{OPERATOR}, + OPERATTIME=#{OPERATTIME}, + ISDELETE=#{ISDELETE} + where + AREA_GATE_ID=#{AREA_GATE_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + AREA_GATE_ID in + + #{item} + + + + + + diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjAreaMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaMapper.xml new file mode 100644 index 00000000..72e79457 --- /dev/null +++ b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaMapper.xml @@ -0,0 +1,186 @@ + + + + + + + MKMJ_AREA + + + + + SYS_DICTIONARIES + + + + + f.AREA_ID, + f.AREA_NAME, + f.AREA_RANGE, + f.AREA_LEAVE, + f.AREA_PARENT_ID, + f.CORPINFO_ID, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.ISDELETE + + + + + AREA_ID, + AREA_NAME, + AREA_RANGE, + AREA_LEAVE, + AREA_PARENT_ID, + CORPINFO_ID, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, + ISDELETE + + + + + #{AREA_ID}, + #{AREA_NAME}, + #{AREA_RANGE}, + #{AREA_LEAVE}, + #{AREA_PARENT_ID}, + #{CORPINFO_ID}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{ISDELETE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + AREA_ID = #{AREA_ID} + + + + + update + + set + AREA_ID=AREA_ID, + AREA_NAME=#{AREA_NAME}, + AREA_RANGE=#{AREA_RANGE}, + AREA_LEAVE=#{AREA_LEAVE}, + AREA_PARENT_ID=#{AREA_PARENT_ID}, + CORPINFO_ID=#{CORPINFO_ID}, + CREATOR=#{CREATOR}, + CREATTIME=#{CREATTIME}, + OPERATOR=#{OPERATOR}, + OPERATTIME=#{OPERATTIME}, + ISDELETE=#{ISDELETE} + where + AREA_ID=#{AREA_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + AREA_ID in + + #{item} + + + + + + + + + + From 6193cf4c03c5ecdec5362c6cf22df2506c7c5368 Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 17 Jan 2024 18:43:03 +0800 Subject: [PATCH 06/64] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/xgf/impl/XgfUserServiceImpl.java | 129 +++++++++++++++--- .../mybatis/datasource/xgf/FlowMapper.xml | 6 + .../datasource/xgf/XgfUserDetailsMapper.xml | 33 ++++- 3 files changed, 145 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index 169722b4..3a912791 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -2,9 +2,7 @@ package com.zcloud.service.xgf.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.datasource.xgf.TrainUsersMapper; -import com.zcloud.mapper.datasource.xgf.XgfUserDetailsMapper; -import com.zcloud.mapper.datasource.xgf.XgfUserMapper; +import com.zcloud.mapper.datasource.xgf.*; import com.zcloud.service.bus.CorpInfoService; import com.zcloud.service.system.DepartmentService; import com.zcloud.service.xgf.XgfUserService; @@ -30,10 +28,13 @@ public class XgfUserServiceImpl implements XgfUserService { private XgfUserDetailsMapper xgfUserDetailsMapper; @Resource - private TrainUsersMapper trainUsersMapper; + private DepartmentService departmentService; @Resource - private DepartmentService departmentService; + private FlowMapper flowMapper; + + @Resource + private FlowDetailMapper flowDetailMapper; @Value("${preventionxgf.api.url}") private String prevention_xgf_url; @@ -60,6 +61,7 @@ public class XgfUserServiceImpl implements XgfUserService { PageData condition = new PageData(); for (PageData x : list) { if (StringUtils.isNotBlank(x.getString("USER_ID"))) { + /* 1、 保存相关方用户信息 */ condition.put("XGF_USER_ID", x.getString("USER_ID")); PageData entity = xgfUserMapper.findById(condition); if (entity == null || entity.size() <= 0) { @@ -67,7 +69,7 @@ public class XgfUserServiceImpl implements XgfUserService { x.put("XGF_USER_DETAILS_ID", x.get("USER_ID")); x.put("XGF_USER_NAME", x.get("NAME")); x.put("VALID_FLAG", "1"); - x.put("STATUS", "2"); + x.put("STATUS", "1"); x.put("CREATED_TIME", DateUtil.getTime()); x.put("OPERATOR_TIME", DateUtil.getTime()); x.put("IS_DELETE", "0"); @@ -113,17 +115,67 @@ public class XgfUserServiceImpl implements XgfUserService { } x.put("IS_DELETE", "0"); x.put("VALID_FLAG", "1"); - x.put("STATUS", "2"); + x.put("STATUS", "1"); if ("2".equals(x.getString("STUDY_STATUS"))) { x.put("STUDY_STATUS", "2"); - }else { + } else { x.put("STUDY_STATUS", entity.getString("STUDY_STATUS")); } - x.put("STUDY_STATUS",entity.getString("STUDY_STATUS")); + x.put("STUDY_STATUS", entity.getString("STUDY_STATUS")); xgfUserMapper.edit(x); xgfUserDetailsMapper.edit(x); } + /* 2、保存相关方人员流程审批信息 */ + condition.clear(); + condition.put("FOREIGN_KEY", x.getString("XGF_USER_ID")); + condition.put("TYPE", "1"); + condition.put("VALID_FLAG", "1"); + PageData flow = flowMapper.findByCondition(condition); + if (flow == null || flow.size() == 0) { + /* 保存审批流程信息 */ + flow = new PageData(); + flow.put("FLOW_ID", Warden.get32UUID()); + flow.put("TYPE", "1"); + flow.put("CREATOR", ""); + flow.put("CREATOR_NAME", ""); + flow.put("CREATOR_TIME", DateUtil.getTime()); + flow.put("VALID_FLAG", "1"); + flow.put("ISDELETE", "0"); + flow.put("FOREIGN_KEY", x.getString("XGF_USER_ID")); + flowMapper.save(flow); + /* 保存审批流程明细信息 */ + PageData flowDetail = new PageData(); + flowDetail.put("FLOW_DETAIL_ID", Warden.get32UUID()); + flowDetail.put("FLOW_ID", flow.getString("FLOW_ID")); + flowDetail.put("STEP_FLAG", "1"); + flowDetail.put("STEP_NAME", "相关方数据将人员信息发送给企业端"); + flowDetail.put("SORT", 0); + flowDetail.put("APPROVER_ID", ""); + flowDetail.put("APPROVER_NAME", ""); + flowDetail.put("APPROVER_TIME", DateUtil.getTime()); + flowDetail.put("APPROVER_CORPINFO_ID", ""); + flowDetail.put("APPROVER_CORPINFO_NAME", ""); + flowDetail.put("PASS_FLAG", "1"); + flowDetail.put("END_FLAG", "0"); + flowDetail.put("ISDELETE", "0"); + flowDetail.put("PARENT_ID", "0"); + flowDetailMapper.save(flowDetail); + } else { + condition.clear(); + condition.put("FLOW_ID", flow.getString("FLOW_ID")); + PageData currentNode = flowDetailMapper.selectOne(condition); + PageData nextNode = new PageData(); + nextNode.putAll(currentNode); + nextNode.put("FLOW_DETAIL_ID", Warden.get32UUID()); + nextNode.put("SORT", Integer.parseInt(currentNode.get("SORT").toString()) + 1); + nextNode.put("PARENT_ID", currentNode.getString("FLOW_DETAIL_ID")); + nextNode.put("STEP_NAME", "相关方数据将人员打回后重新发送给企业端"); + flowDetailMapper.save(nextNode); + currentNode.put("STEP_FLAG", "0"); + flowDetailMapper.edit(currentNode); + } + } } } @@ -131,7 +183,6 @@ public class XgfUserServiceImpl implements XgfUserService { @Override public void approvalApplication(PageData request) throws Exception { - List list = Arrays.asList(request.getString("xgf_user_ids").split(",")); PageData condition = new PageData(); @@ -139,7 +190,7 @@ public class XgfUserServiceImpl implements XgfUserService { List entities = xgfUserMapper.listByIds(condition); /* 校验所有数据是否都是正常状态 */ if (entities.stream().anyMatch(n -> !"2".equals(n.getString("STATUS")))) { - String name = entities.stream().filter(n -> !"2".equals(n.getString("STATUS"))).map( n -> n.getString("NAME")).collect(Collectors.joining(",")); + String name = entities.stream().filter(n -> !"2".equals(n.getString("STATUS"))).map(n -> n.getString("NAME")).collect(Collectors.joining(",")); throw new RuntimeException("用户[" + name + "]在系统流程中无法被打回"); } @@ -171,19 +222,59 @@ public class XgfUserServiceImpl implements XgfUserService { throw new RuntimeException("未找到该用户"); } if ("1".equals(request.getString("STATUS"))) { - entity.put("STATUS", "0"); - } else { entity.put("STATUS", "2"); entity.put("VALID_FLAG", "1"); + // 企业端人员审核完成后，指定企业端监管部门，中的某人进行培训 + condition.clear(); + condition.put("XFG_USER_DETAILS_ID", x); + PageData userInfo = xgfUserDetailsMapper.findById(condition); + if (userInfo == null || userInfo.size() == 0) { + throw new RuntimeException("未找到该用户详细信息"); + } + userInfo.put("APPOINT_DEPARTMENT_ID", request.getString("APPOINT_DEPARTMENT_ID")); + userInfo.put("APPOINT_DEPARTMENT_NAME", request.getString("APPOINT_DEPARTMENT_NAME")); + } else { + entity.put("STATUS", "0"); + PageData key = new PageData(); + key.putAll(entity); + key.put("USER_ID", condition.get("XGF_USER_ID")); + key.put("STATUS", request.getString("STATUS")); + Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); + if (result == null || !"succeed".equals(result.get("result"))) { + throw new RuntimeException("请求失败"); + } } xgfUserMapper.edit(entity); - - entity.put("USER_ID", condition.get("XGF_USER_ID")); - entity.put("STATUS", request.getString("STATUS")); - Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", entity); - if (result == null || !"succeed".equals(result.get("result"))) { - throw new RuntimeException("请求失败"); + /* 保存审批流程明细信息 */ + condition.clear(); + condition.put("FOREIGN_KEY", entity.getString("XGF_USER_ID")); + condition.put("TYPE", "1"); + condition.put("VALID_FLAG", "1"); + PageData flow = flowMapper.findByCondition(condition); + if (flow == null || flow.size() == 0){ + throw new RuntimeException("未找到该用户审批流程"); } + condition.clear(); + condition.put("FLOW_ID", flow.getString("FLOW_ID")); + PageData currentNode = flowDetailMapper.selectOne(condition); + PageData nextNode = new PageData(); + nextNode.put("FLOW_DETAIL_ID", Warden.get32UUID()); + nextNode.put("FLOW_ID", flow.getString("FLOW_ID")); + nextNode.put("STEP_FLAG", "1"); + nextNode.put("STEP_NAME", "相关方数据将人员信息发送给企业端"); + nextNode.put("SORT", Integer.parseInt(currentNode.get("SORT").toString()) + 1); + nextNode.put("APPROVER_ID", Jurisdiction.getUSER_ID()); + nextNode.put("APPROVER_NAME", Jurisdiction.getName()); + nextNode.put("APPROVER_TIME", DateUtil.getTime()); + nextNode.put("APPROVER_CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + nextNode.put("APPROVER_CORPINFO_NAME", ""); + nextNode.put("PASS_FLAG", request.getString("STATUS")); + nextNode.put("END_FLAG", "0"); + nextNode.put("ISDELETE", "0"); + nextNode.put("PARENT_ID", currentNode.getString("FLOW_DETAIL_ID")); + flowDetailMapper.save(nextNode); + currentNode.put("STEP_FLAG", "0"); + flowDetailMapper.edit(currentNode); } } diff --git a/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml b/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml index 978c5797..94da1851 100644 --- a/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml @@ -87,5 +87,11 @@ and a.FOREIGN_KEY = #{FOREIGN_KEY} + + and a.TYPE = #{TYPE} + + + and a.VALID_FLAG = #{VALID_FLAG} + diff --git a/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml index 0c1343c9..b0713313 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml @@ -63,7 +63,14 @@ f.IS_BF, f.IS_SOCIAL, f.SOCIAL_NUMBER, - f.zzName + f.zzName, + f.APPOINT_DEPARTMENT_ID, + f.APPOINT_DEPARTMENT_NAME, + f.APPOINT_ONE_CORP_ID, + f.APPOINT_ONE_CORP_NAME, + f.APPOINT_ONE_DEPARTMENT_ID, + f.APPOINT_ONE_DEPARTMENT_NAME + @@ -122,7 +129,13 @@ IS_BF, IS_SOCIAL, SOCIAL_NUMBER, - zzName + zzName, + APPOINT_DEPARTMENT_ID, + APPOINT_DEPARTMENT_NAME, + APPOINT_ONE_CORP_ID, + APPOINT_ONE_CORP_NAME, + APPOINT_ONE_DEPARTMENT_ID, + APPOINT_ONE_DEPARTMENT_NAME @@ -181,7 +194,13 @@ #{IS_BF}, #{IS_SOCIAL}, #{SOCIAL_NUMBER}, - #{zzName} + #{zzName}, + #{APPOINT_DEPARTMENT_ID}, + #{APPOINT_DEPARTMENT_NAME}, + #{APPOINT_ONE_CORP_ID}, + #{APPOINT_ONE_CORP_NAME}, + #{APPOINT_ONE_DEPARTMENT_ID}, + #{APPOINT_ONE_DEPARTMENT_NAME} @@ -264,7 +283,13 @@ IS_BF = #{IS_BF}, IS_SOCIAL = #{IS_SOCIAL}, SOCIAL_NUMBER = #{SOCIAL_NUMBER}, - zzName = #{zzName} + zzName = #{zzName}, + APPOINT_DEPARTMENT_ID = #{APPOINT_DEPARTMENT_ID}, + APPOINT_DEPARTMENT_NAME = #{APPOINT_DEPARTMENT_NAME}, + APPOINT_ONE_CORP_ID = #{APPOINT_ONE_CORP_ID}, + APPOINT_ONE_CORP_NAME = #{APPOINT_ONE_CORP_NAME}, + APPOINT_ONE_DEPARTMENT_ID = #{APPOINT_ONE_DEPARTMENT_ID}, + APPOINT_ONE_DEPARTMENT_NAME = #{APPOINT_ONE_DEPARTMENT_NAME} where XGF_USER_DETAILS_ID = #{XGF_USER_DETAILS_ID} From 1cf1adefd9c2a001b778f29a251498282fb3d6ad Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 18 Jan 2024 13:56:15 +0800 Subject: [PATCH 07/64] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xgf/TrainingBatchController.java | 1 - .../controller/xgf/XgfUserController.java | 29 +++++++++++++- .../mapper/datasource/xgf/XgfUserMapper.java | 2 + .../zcloud/service/xgf/XgfUserService.java | 2 + .../service/xgf/impl/XgfUserServiceImpl.java | 22 +++++++++- .../datasource/xgf/XgfUserDetailsMapper.xml | 24 +++++++++-- .../mybatis/datasource/xgf/XgfUserMapper.xml | 40 +++++++++++++++++-- 7 files changed, 108 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/zcloud/controller/xgf/TrainingBatchController.java b/src/main/java/com/zcloud/controller/xgf/TrainingBatchController.java index feb476ac..26bbb122 100644 --- a/src/main/java/com/zcloud/controller/xgf/TrainingBatchController.java +++ b/src/main/java/com/zcloud/controller/xgf/TrainingBatchController.java @@ -117,7 +117,6 @@ public class TrainingBatchController extends BaseController { * @throws Exception */ @RequestMapping(value = "/userList") - @RequiresPermissions("trainingbatch:list") @ResponseBody public Object userList(Page page) throws Exception { Map map = new HashMap(); diff --git a/src/main/java/com/zcloud/controller/xgf/XgfUserController.java b/src/main/java/com/zcloud/controller/xgf/XgfUserController.java index 3929e092..f9ade76d 100644 --- a/src/main/java/com/zcloud/controller/xgf/XgfUserController.java +++ b/src/main/java/com/zcloud/controller/xgf/XgfUserController.java @@ -29,7 +29,6 @@ public class XgfUserController extends BaseController { @Resource private TrainingBatchService trainingBatchService; - @RequestMapping(value = "/list") @ResponseBody public Object list(Page page) throws Exception { @@ -43,6 +42,9 @@ public class XgfUserController extends BaseController { return response; } + /** + * 人员信息审核 + */ @RequestMapping(value = "/approve") @ResponseBody public Object approve() throws Exception { @@ -95,4 +97,29 @@ public class XgfUserController extends BaseController { response.put("data", request); return response; } + + @RequestMapping(value = "/getAppointApproveList") + @ResponseBody + public Object getAppointApproveList(Page page) throws Exception{ + PageData request = this.getPageData(); + page.setPd(request); + PageData response = new PageData(); + response.put("result", "success"); + response.put("list", xgfUserService.getAppointApproveList(page)); + response.put("page", page); + return response; + } + + /** + * 人员指定审核 + */ + @RequestMapping(value = "/appointApprove") + @ResponseBody + public Object appointApprove() throws Exception{ + PageData request = this.getPageData(); + PageData response = new PageData(); + response.put("result", "success"); + response.put("data", request); + return response; + } } diff --git a/src/main/java/com/zcloud/mapper/datasource/xgf/XgfUserMapper.java b/src/main/java/com/zcloud/mapper/datasource/xgf/XgfUserMapper.java index 63d2150e..87f11474 100644 --- a/src/main/java/com/zcloud/mapper/datasource/xgf/XgfUserMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/xgf/XgfUserMapper.java @@ -70,4 +70,6 @@ public interface XgfUserMapper { PageData getInfoById(PageData condition); List findRecordList(PageData condition); + + List appointlistPage(Page page); } diff --git a/src/main/java/com/zcloud/service/xgf/XgfUserService.java b/src/main/java/com/zcloud/service/xgf/XgfUserService.java index 3397027c..47ee65ad 100644 --- a/src/main/java/com/zcloud/service/xgf/XgfUserService.java +++ b/src/main/java/com/zcloud/service/xgf/XgfUserService.java @@ -24,4 +24,6 @@ public interface XgfUserService { PageData findInfo(PageData condition); List findRecordList(PageData condition) throws Exception; + + List getAppointApproveList(Page page); } diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index 3a912791..2321c4db 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -70,6 +70,7 @@ public class XgfUserServiceImpl implements XgfUserService { x.put("XGF_USER_NAME", x.get("NAME")); x.put("VALID_FLAG", "1"); x.put("STATUS", "1"); + x.put("CHECK_STATUS","0"); x.put("CREATED_TIME", DateUtil.getTime()); x.put("OPERATOR_TIME", DateUtil.getTime()); x.put("IS_DELETE", "0"); @@ -116,6 +117,7 @@ public class XgfUserServiceImpl implements XgfUserService { x.put("IS_DELETE", "0"); x.put("VALID_FLAG", "1"); x.put("STATUS", "1"); + x.put("CHECK_STATUS","0"); if ("2".equals(x.getString("STUDY_STATUS"))) { x.put("STUDY_STATUS", "2"); } else { @@ -221,18 +223,23 @@ public class XgfUserServiceImpl implements XgfUserService { if (entity == null || entity.size() == 0) { throw new RuntimeException("未找到该用户"); } + // 通过则指定监管部门人员进行审核，不同过则打回相关方端(将CHECK_STATUS改为1) if ("1".equals(request.getString("STATUS"))) { - entity.put("STATUS", "2"); + entity.put("STATUS", "1"); entity.put("VALID_FLAG", "1"); - // 企业端人员审核完成后，指定企业端监管部门，中的某人进行培训 + entity.put("CHECK_STATUS","1"); condition.clear(); condition.put("XFG_USER_DETAILS_ID", x); PageData userInfo = xgfUserDetailsMapper.findById(condition); if (userInfo == null || userInfo.size() == 0) { throw new RuntimeException("未找到该用户详细信息"); } + // 企业端人员审核完成后，指定企业端监管部门，中的某人进行审核 userInfo.put("APPOINT_DEPARTMENT_ID", request.getString("APPOINT_DEPARTMENT_ID")); userInfo.put("APPOINT_DEPARTMENT_NAME", request.getString("APPOINT_DEPARTMENT_NAME")); + userInfo.put("APPOINT_USER_ID", request.getString("APPOINT_USER_ID")); + userInfo.put("APPOINT_USER_NAME", request.getString("APPOINT_USER_NAME")); + xgfUserDetailsMapper.edit(userInfo); } else { entity.put("STATUS", "0"); PageData key = new PageData(); @@ -287,4 +294,15 @@ public class XgfUserServiceImpl implements XgfUserService { public List findRecordList(PageData condition) throws Exception { return xgfUserMapper.findRecordList(condition); } + + @Override + public List getAppointApproveList(Page page) { + List list = xgfUserMapper.appointlistPage(page); + for (PageData x : list) { + if (StringUtils.isNotBlank(x.getString("APPOINT_USER_ID"))) { + // TODO 判断当前人是否有权限审批 + } + } + return list; + } } diff --git a/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml index b0713313..3115441f 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml @@ -66,10 +66,14 @@ f.zzName, f.APPOINT_DEPARTMENT_ID, f.APPOINT_DEPARTMENT_NAME, + f.APPOINT_USER_ID, + f.APPOINT_USER_NAME, f.APPOINT_ONE_CORP_ID, f.APPOINT_ONE_CORP_NAME, f.APPOINT_ONE_DEPARTMENT_ID, - f.APPOINT_ONE_DEPARTMENT_NAME + f.APPOINT_ONE_DEPARTMENT_NAME, + f.APPOINT_ONE_USER_ID, + f.APPOINT_ONE_USER_NAME @@ -132,10 +136,14 @@ zzName, APPOINT_DEPARTMENT_ID, APPOINT_DEPARTMENT_NAME, + APPOINT_USER_ID, + APPOINT_USER_NAME, APPOINT_ONE_CORP_ID, APPOINT_ONE_CORP_NAME, APPOINT_ONE_DEPARTMENT_ID, - APPOINT_ONE_DEPARTMENT_NAME + APPOINT_ONE_DEPARTMENT_NAME, + APPOINT_ONE_USER_ID, + APPOINT_ONE_USER_NAME @@ -197,10 +205,14 @@ #{zzName}, #{APPOINT_DEPARTMENT_ID}, #{APPOINT_DEPARTMENT_NAME}, + #{APPOINT_USER_ID}, + #{APPOINT_USER_NAME}, #{APPOINT_ONE_CORP_ID}, #{APPOINT_ONE_CORP_NAME}, #{APPOINT_ONE_DEPARTMENT_ID}, - #{APPOINT_ONE_DEPARTMENT_NAME} + #{APPOINT_ONE_DEPARTMENT_NAME}, + #{APPOINT_ONE_USER_ID}, + #{APPOINT_ONE_USER_NAME} @@ -286,10 +298,14 @@ zzName = #{zzName}, APPOINT_DEPARTMENT_ID = #{APPOINT_DEPARTMENT_ID}, APPOINT_DEPARTMENT_NAME = #{APPOINT_DEPARTMENT_NAME}, + APPOINT_USER_ID = #{APPOINT_USER_ID}, + APPOINT_USER_NAME = #{APPOINT_USER_NAME}, APPOINT_ONE_CORP_ID = #{APPOINT_ONE_CORP_ID}, APPOINT_ONE_CORP_NAME = #{APPOINT_ONE_CORP_NAME}, APPOINT_ONE_DEPARTMENT_ID = #{APPOINT_ONE_DEPARTMENT_ID}, - APPOINT_ONE_DEPARTMENT_NAME = #{APPOINT_ONE_DEPARTMENT_NAME} + APPOINT_ONE_DEPARTMENT_NAME = #{APPOINT_ONE_DEPARTMENT_NAME}, + APPOINT_ONE_USER_ID = #{APPOINT_ONE_USER_ID}, + APPOINT_ONE_USER_NAME = #{APPOINT_ONE_USER_NAME} where XGF_USER_DETAILS_ID = #{XGF_USER_DETAILS_ID} diff --git a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml index ddbff968..78e7a597 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml @@ -21,7 +21,8 @@ f.STATUS, f.OPERATOR_TIME, f.ISFLOW, - f.STUDY_STATUS + f.STUDY_STATUS, + f.CHECK_STATUS @@ -38,7 +39,8 @@ STATUS, OPERATOR_TIME, ISFLOW, - STUDY_STATUS + STUDY_STATUS, + CHECK_STATUS @@ -55,7 +57,8 @@ #{STATUS}, #{OPERATOR_TIME}, #{ISFLOW}, - #{STUDY_STATUS} + #{STUDY_STATUS}, + #{CHECK_STATUS} @@ -95,7 +98,8 @@ STATUS = #{STATUS}, OPERATOR_TIME = #{OPERATOR_TIME}, ISFLOW = #{ISFLOW}, - STUDY_STATUS = #{STUDY_STATUS} + STUDY_STATUS = #{STUDY_STATUS}, + CHECK_STATUS = #{CHECK_STATUS} where XGF_USER_ID = #{XGF_USER_ID} @@ -229,6 +233,9 @@ and a.VALID_FLAG = #{pd.VALID_FLAG} + + and a.CHECK_STATUS = #{pd.CHECK_STATUS} + + From 7a721799b77f46aab1ea6f41cba0379e62a66e3d Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Thu, 18 Jan 2024 16:26:59 +0800 Subject: [PATCH 08/64] =?UTF-8?q?=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81?= =?UTF-8?q?=E8=BF=9B=E5=87=BA=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mkmj/MkmjGateLogController.java | 122 ++++++++++++ .../service/mkmj/MkmjGateLogService.java | 60 ++++++ .../mkmj/impl/MkmjGateLogServiceImpl.java | 92 +++++++++ .../datasource/mkmj/MkmjAreaGateMapper.xml | 5 +- .../datasource/mkmj/MkmjGateLogMapper.xml | 175 ++++++++++++++++++ 5 files changed, 453 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/zcloud/controller/mkmj/MkmjGateLogController.java create mode 100644 src/main/java/com/zcloud/service/mkmj/MkmjGateLogService.java create mode 100644 src/main/java/com/zcloud/service/mkmj/impl/MkmjGateLogServiceImpl.java create mode 100644 src/main/resources/mybatis/datasource/mkmj/MkmjGateLogMapper.xml diff --git a/src/main/java/com/zcloud/controller/mkmj/MkmjGateLogController.java b/src/main/java/com/zcloud/controller/mkmj/MkmjGateLogController.java new file mode 100644 index 00000000..9fa7455d --- /dev/null +++ b/src/main/java/com/zcloud/controller/mkmj/MkmjGateLogController.java @@ -0,0 +1,122 @@ +package com.zcloud.controller.mkmj; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.map.util.ReturnMap; +import com.zcloud.service.mkmj.MkmjAreaGateService; +import com.zcloud.service.mkmj.MkmjGateLogService; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.Tools; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：门口门禁区域 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/mkmjAreaGate") +public class MkmjGateLogController extends BaseController { + + @Autowired + private MkmjGateLogService mkmjGateLogService; + + /**新增 + * @param + * @throws Exception + */ + @RequestMapping(value="/add") + @RequiresPermissions("mkmjAreaGate:add") + @ResponseBody + public ReturnMap add() throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 添加人 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 添加时间 + pd.put("ISDELETE", "0"); //是否删除 + pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date()));//修改时间 + return mkmjGateLogService.save(pd); + } + + /**删除 + * @param + * @throws Exception + */ + @RequestMapping(value="/delete") + @RequiresPermissions("mkmjAreaGate:del") + @ResponseBody + public ReturnMap delete() throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + return mkmjGateLogService.delete(pd); + } + + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/edit") + @RequiresPermissions("mkmjAreaGate:edit") + @ResponseBody + public ReturnMap edit() throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date()));//修改时间 + return mkmjGateLogService.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/list") + @RequiresPermissions("mkmjAreaGate:list") + @ResponseBody + public Object list(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + page.setPd(pd); + List varList = mkmjGateLogService.list(page); //列出Coursectk列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /**去修改页面获取数据 + * @param + * @throws Exception + */ + @RequestMapping(value="/goEdit") + @RequiresPermissions("mkmjAreaGate:edit") + @ResponseBody + public Object goEdit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = mkmjGateLogService.findById(pd); //根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + +} diff --git a/src/main/java/com/zcloud/service/mkmj/MkmjGateLogService.java b/src/main/java/com/zcloud/service/mkmj/MkmjGateLogService.java new file mode 100644 index 00000000..a5146ec5 --- /dev/null +++ b/src/main/java/com/zcloud/service/mkmj/MkmjGateLogService.java @@ -0,0 +1,60 @@ +package com.zcloud.service.mkmj; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.map.util.ReturnMap; + +import java.util.List; + +/** + * 说明：门口门禁区域闸机 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +public interface MkmjGateLogService { + + /**新增 + * @param pd + * @throws Exception + */ + public ReturnMap save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public ReturnMap delete(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public ReturnMap edit(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public ReturnMap deleteAll(String[] ArrayDATA_IDS)throws Exception; + +} + diff --git a/src/main/java/com/zcloud/service/mkmj/impl/MkmjGateLogServiceImpl.java b/src/main/java/com/zcloud/service/mkmj/impl/MkmjGateLogServiceImpl.java new file mode 100644 index 00000000..a71bbade --- /dev/null +++ b/src/main/java/com/zcloud/service/mkmj/impl/MkmjGateLogServiceImpl.java @@ -0,0 +1,92 @@ +package com.zcloud.service.mkmj.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.mkmj.MkmjAreaGateMapper; +import com.zcloud.mapper.datasource.mkmj.MkmjGateLogMapper; +import com.zcloud.service.map.util.ReturnMap; +import com.zcloud.service.mkmj.MkmjAreaGateService; +import com.zcloud.service.mkmj.MkmjGateLogService; +import com.zcloud.util.UuidUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; + +import java.util.List; + +/** + * 说明：门口门禁区域闸机 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class MkmjGateLogServiceImpl implements MkmjGateLogService { + + @Autowired + private MkmjGateLogMapper mkmjGateLogMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public ReturnMap save(PageData pd)throws Exception{ + mkmjGateLogMapper.save(pd); + return ReturnMap.ok("保存成功"); + } + + /**删除 + * @param pd + * @throws Exception + */ + public ReturnMap delete(PageData pd)throws Exception{ + mkmjGateLogMapper.delete(pd); + return ReturnMap.ok("删除成功"); + } + + /**修改 + * @param pd + * @throws Exception + */ + public ReturnMap edit(PageData pd)throws Exception{ + mkmjGateLogMapper.edit(pd); + return ReturnMap.ok("编辑成功"); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return mkmjGateLogMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return mkmjGateLogMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return mkmjGateLogMapper.findById(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public ReturnMap deleteAll(String[] ArrayDATA_IDS)throws Exception{ + mkmjGateLogMapper.deleteAll(ArrayDATA_IDS); + return ReturnMap.ok("删除成功"); + } + +} + diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml index 748585af..7632348d 100644 --- a/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml +++ b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml @@ -101,7 +101,7 @@ update set - AREA_GATE_ID= AREA_GATE_ID + AREA_GATE_ID= AREA_GATE_ID, GATE_NUMBER=#{GATE_NUMBER}, AREA_ID=#{AREA_ID}, GATE_NAME=#{GATE_NAME}, @@ -149,6 +149,9 @@ --> ) + + and f.AREA_ID=#{pd.AREA_ID} + diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjGateLogMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjGateLogMapper.xml new file mode 100644 index 00000000..10dfa80e --- /dev/null +++ b/src/main/resources/mybatis/datasource/mkmj/MkmjGateLogMapper.xml @@ -0,0 +1,175 @@ + + + + + + + MKMJ_GATE_LOG + + + + + SYS_DICTIONARIES + + + + + f.AREA_LOG_ID, + f.AREA_GATE_ID, + f.STATE, + f.LOG_TIME, + f.USER_CARD, + f.GATE_TYPE, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.ISDELETE, + f.EX1, + f.EX2, + f.EX3, + f.EX4, + f.EX5 + + + + + AREA_LOG_ID, + AREA_GATE_ID, + STATE, + LOG_TIME, + USER_CARD, + GATE_TYPE, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, + ISDELETE, + EX1, + EX2, + EX3, + EX4, + EX5 + + + + + #{AREA_LOG_ID}, + #{AREA_GATE_ID}, + #{STATE}, + #{LOG_TIME}, + #{USER_CARD}, + #{GATE_TYPE}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{ISDELETE}, + #{EX1}, + #{EX2}, + #{EX3}, + #{EX4}, + #{EX5} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + AREA_LOG_ID = #{AREA_LOG_ID} + + + + + update + + set + AREA_LOG_ID= AREA_LOG_ID, + AREA_GATE_ID=#{AREA_GATE_ID}, + STATE=#{STATE}, + LOG_TIME=#{LOG_TIME}, + USER_CARD=#{USER_CARD}, + GATE_TYPE=#{GATE_TYPE}, + CREATOR=#{CREATOR}, + CREATTIME=#{CREATTIME}, + OPERATOR=#{OPERATOR}, + OPERATTIME=#{OPERATTIME}, + ISDELETE=#{ISDELETE}, + EX1=#{EX1}, + EX2=#{EX2}, + EX3=#{EX3}, + EX4=#{EX4}, + EX5=#{EX5} + where + AREA_LOG_ID=#{AREA_LOG_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + AREA_LOG_ID in + + #{item} + + + + From 0aec1ad9465c6f39a67aef357453e9abbb559fff Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Thu, 18 Jan 2024 16:29:47 +0800 Subject: [PATCH 09/64] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E6=B2=A7=E5=B7=9E=E7=9F=BF=E7=9F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PersonnelManagementController.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zcloud/controller/keyProjects/PersonnelManagementController.java b/src/main/java/com/zcloud/controller/keyProjects/PersonnelManagementController.java index 35d66633..57a18522 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/PersonnelManagementController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/PersonnelManagementController.java @@ -1,5 +1,7 @@ package com.zcloud.controller.keyProjects; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -37,6 +39,7 @@ public class PersonnelManagementController extends BaseController { @RequestMapping(value = "/add") @RequiresPermissions("personnelmanagement:add") @ResponseBody + @DockAnnotation public Object add() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -49,6 +52,8 @@ public class PersonnelManagementController extends BaseController { pd.put("ISDELETE", "0"); //是否删除 pd.put("PASSWORD", new SimpleHash("SHA-1", pd.getString("PHONENUM"), Const.DEFAULT_PASSWORD).toString()); personnelmanagementService.save(pd); + pd.put("sendAllCorp",1); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } @@ -62,6 +67,7 @@ public class PersonnelManagementController extends BaseController { @RequestMapping(value = "/delete") @RequiresPermissions("personnelmanagement:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -76,6 +82,8 @@ public class PersonnelManagementController extends BaseController { map.put("msg", "只用添加人" + state + "可以删除相关方人员！"); } + pd.put("sendAllCorp",1); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; } @@ -89,6 +97,7 @@ public class PersonnelManagementController extends BaseController { @RequestMapping(value = "/edit") @RequiresPermissions("personnelmanagement:edit") @ResponseBody + @DockAnnotation public Object edit() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -103,6 +112,8 @@ public class PersonnelManagementController extends BaseController { map.put("msg", "只用添加人" + state + "可以删除相关方人员！"); } + pd.put("sendAllCorp",1); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } @@ -309,6 +320,7 @@ public class PersonnelManagementController extends BaseController { @RequestMapping(value = "/resetPwd") @ResponseBody + @DockAnnotation public Object resetPwd(Page page) throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -320,7 +332,8 @@ public class PersonnelManagementController extends BaseController { updateUser.put("PASSWORD", pwd); updateUser.put("PERSONNELMANAGEMENT_ID", pageData.getString("PERSONNELMANAGEMENT_ID")); personnelmanagementService.editPassword(updateUser); - + pd.put("sendAllCorp",1); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } From bdadc00015ffa7476bad7ecec405d7e9752c623b Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 18 Jan 2024 19:36:33 +0800 Subject: [PATCH 10/64] =?UTF-8?q?=E5=9E=83=E5=9C=BE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code/mysql数据库脚本/BUS_PUBLICMETER.sql | 23 -------- .../mysql数据库脚本/BUS_SMSMANAGEMENT.sql | 22 -------- .../code/oracle数据库脚本/BUS_PUBLICMETER.sql | 53 ------------------- .../oracle数据库脚本/BUS_SMSMANAGEMENT.sql | 51 ------------------ .../sqlserver数据库脚本/BUS_PUBLICMETER.sql | 25 --------- .../sqlserver数据库脚本/BUS_SMSMANAGEMENT.sql | 24 --------- 6 files changed, 198 deletions(-) delete mode 100644 src/main/webapp/admin/createcode/code/mysql数据库脚本/BUS_PUBLICMETER.sql delete mode 100644 src/main/webapp/admin/createcode/code/mysql数据库脚本/BUS_SMSMANAGEMENT.sql delete mode 100644 src/main/webapp/admin/createcode/code/oracle数据库脚本/BUS_PUBLICMETER.sql delete mode 100644 src/main/webapp/admin/createcode/code/oracle数据库脚本/BUS_SMSMANAGEMENT.sql delete mode 100644 src/main/webapp/admin/createcode/code/sqlserver数据库脚本/BUS_PUBLICMETER.sql delete mode 100644 src/main/webapp/admin/createcode/code/sqlserver数据库脚本/BUS_SMSMANAGEMENT.sql diff --git a/src/main/webapp/admin/createcode/code/mysql数据库脚本/BUS_PUBLICMETER.sql b/src/main/webapp/admin/createcode/code/mysql数据库脚本/BUS_PUBLICMETER.sql deleted file mode 100644 index d435c996..00000000 --- a/src/main/webapp/admin/createcode/code/mysql数据库脚本/BUS_PUBLICMETER.sql +++ /dev/null @@ -1,23 +0,0 @@ - -SET FOREIGN_KEY_CHECKS=0; - --- ---------------------------- --- Table structure for `BUS_PUBLICMETER` --- ---------------------------- -DROP TABLE IF EXISTS `BUS_PUBLICMETER`; -CREATE TABLE `BUS_PUBLICMETER` ( - `PUBLICMETER_ID` varchar(100) NOT NULL, - `PRECINCT_ID` varchar(255) DEFAULT NULL COMMENT '管理区', - `NAME` varchar(255) DEFAULT NULL COMMENT '巡更点名称', - `CODE` varchar(255) DEFAULT NULL COMMENT '编号', - `DESCR` varchar(255) DEFAULT NULL COMMENT '备注', - `ISDELETE` int(1) NOT NULL COMMENT '是否删除', - `CREATOR` varchar(255) DEFAULT NULL COMMENT '创建人', - `CREATTIME` varchar(32) DEFAULT NULL COMMENT '创建时间', - `OPERATOR` varchar(255) DEFAULT NULL COMMENT '操作人', - `OPERATTIME` varchar(32) DEFAULT NULL COMMENT '操作时间', - `TYPE` int(1) NOT NULL COMMENT '仪表类型', - `METERINDEX` varchar(255) DEFAULT NULL COMMENT '仪表指数', - `CYCLE` int(1) NOT NULL COMMENT '抄表周期', - PRIMARY KEY (`PUBLICMETER_ID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/src/main/webapp/admin/createcode/code/mysql数据库脚本/BUS_SMSMANAGEMENT.sql b/src/main/webapp/admin/createcode/code/mysql数据库脚本/BUS_SMSMANAGEMENT.sql deleted file mode 100644 index dcab4c42..00000000 --- a/src/main/webapp/admin/createcode/code/mysql数据库脚本/BUS_SMSMANAGEMENT.sql +++ /dev/null @@ -1,22 +0,0 @@ - -SET FOREIGN_KEY_CHECKS=0; - --- ---------------------------- --- Table structure for `BUS_SMSMANAGEMENT` --- ---------------------------- -DROP TABLE IF EXISTS `BUS_SMSMANAGEMENT`; -CREATE TABLE `BUS_SMSMANAGEMENT` ( - `SMSMANAGEMENT_ID` varchar(100) NOT NULL, - `SMSNAME` varchar(255) DEFAULT NULL COMMENT '名称', - `SMSCODE` varchar(255) DEFAULT NULL COMMENT '编码', - `SMSTYPE` varchar(255) DEFAULT NULL COMMENT '类型', - `ADDRESSEE` varchar(255) DEFAULT NULL COMMENT '收信人', - `ISENABLE` varchar(255) DEFAULT NULL COMMENT '是否启用', - `CORPINFO_ID` varchar(255) DEFAULT NULL COMMENT '企业ID', - `OPDATE` varchar(32) DEFAULT NULL COMMENT '操作日期', - `OPUSER` varchar(255) DEFAULT NULL COMMENT '操作人', - `ISDELETE` varchar(255) DEFAULT NULL COMMENT '是否删除', - `OPERATOR` varchar(255) DEFAULT NULL COMMENT '修改人', - `OPERATTIME` varchar(32) DEFAULT NULL COMMENT '修改日期', - PRIMARY KEY (`SMSMANAGEMENT_ID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/src/main/webapp/admin/createcode/code/oracle数据库脚本/BUS_PUBLICMETER.sql b/src/main/webapp/admin/createcode/code/oracle数据库脚本/BUS_PUBLICMETER.sql deleted file mode 100644 index 8b034ff8..00000000 --- a/src/main/webapp/admin/createcode/code/oracle数据库脚本/BUS_PUBLICMETER.sql +++ /dev/null @@ -1,53 +0,0 @@ --- ---------------------------- --- Table structure for "C##FHBOOT"."BUS_PUBLICMETER" --- ---------------------------- --- DROP TABLE "C##FHBOOT"."BUS_PUBLICMETER"; -CREATE TABLE "C##FHBOOT"."BUS_PUBLICMETER" ( - "PRECINCT_ID" VARCHAR2(255 BYTE) NULL , - "NAME" VARCHAR2(255 BYTE) NULL , - "CODE" VARCHAR2(255 BYTE) NULL , - "DESCR" VARCHAR2(255 BYTE) NULL , - "ISDELETE" NUMBER(1) NULL , - "CREATOR" VARCHAR2(255 BYTE) NULL , - "CREATTIME" VARCHAR2(32 BYTE) NULL , - "OPERATOR" VARCHAR2(255 BYTE) NULL , - "OPERATTIME" VARCHAR2(32 BYTE) NULL , - "TYPE" NUMBER(1) NULL , - "METERINDEX" VARCHAR2(255 BYTE) NULL , - "CYCLE" NUMBER(1) NULL , - "PUBLICMETER_ID" VARCHAR2(100 BYTE) NOT NULL -) -LOGGING -NOCOMPRESS -NOCACHE -; - -COMMENT ON COLUMN "C##FHBOOT"."BUS_PUBLICMETER"."PRECINCT_ID" IS '管理区'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_PUBLICMETER"."NAME" IS '巡更点名称'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_PUBLICMETER"."CODE" IS '编号'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_PUBLICMETER"."DESCR" IS '备注'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_PUBLICMETER"."ISDELETE" IS '是否删除'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_PUBLICMETER"."CREATOR" IS '创建人'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_PUBLICMETER"."CREATTIME" IS '创建时间'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_PUBLICMETER"."OPERATOR" IS '操作人'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_PUBLICMETER"."OPERATTIME" IS '操作时间'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_PUBLICMETER"."TYPE" IS '仪表类型'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_PUBLICMETER"."METERINDEX" IS '仪表指数'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_PUBLICMETER"."CYCLE" IS '抄表周期'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_PUBLICMETER"."PUBLICMETER_ID" IS 'ID'; - --- ---------------------------- --- Indexes structure for table BUS_PUBLICMETER --- ---------------------------- - --- ---------------------------- --- Checks structure for table "C##FHBOOT"."BUS_PUBLICMETER" - --- ---------------------------- - -ALTER TABLE "C##FHBOOT"."BUS_PUBLICMETER" ADD CHECK ("PUBLICMETER_ID" IS NOT NULL); - --- ---------------------------- --- Primary Key structure for table "C##FHBOOT"."BUS_PUBLICMETER" --- ---------------------------- -ALTER TABLE "C##FHBOOT"."BUS_PUBLICMETER" ADD PRIMARY KEY ("PUBLICMETER_ID"); diff --git a/src/main/webapp/admin/createcode/code/oracle数据库脚本/BUS_SMSMANAGEMENT.sql b/src/main/webapp/admin/createcode/code/oracle数据库脚本/BUS_SMSMANAGEMENT.sql deleted file mode 100644 index 58d451db..00000000 --- a/src/main/webapp/admin/createcode/code/oracle数据库脚本/BUS_SMSMANAGEMENT.sql +++ /dev/null @@ -1,51 +0,0 @@ --- ---------------------------- --- Table structure for "C##FHBOOT"."BUS_SMSMANAGEMENT" --- ---------------------------- --- DROP TABLE "C##FHBOOT"."BUS_SMSMANAGEMENT"; -CREATE TABLE "C##FHBOOT"."BUS_SMSMANAGEMENT" ( - "SMSNAME" VARCHAR2(255 BYTE) NULL , - "SMSCODE" VARCHAR2(255 BYTE) NULL , - "SMSTYPE" VARCHAR2(255 BYTE) NULL , - "ADDRESSEE" VARCHAR2(255 BYTE) NULL , - "ISENABLE" VARCHAR2(255 BYTE) NULL , - "CORPINFO_ID" VARCHAR2(255 BYTE) NULL , - "OPDATE" VARCHAR2(32 BYTE) NULL , - "OPUSER" VARCHAR2(255 BYTE) NULL , - "ISDELETE" VARCHAR2(255 BYTE) NULL , - "OPERATOR" VARCHAR2(255 BYTE) NULL , - "OPERATTIME" VARCHAR2(32 BYTE) NULL , - "SMSMANAGEMENT_ID" VARCHAR2(100 BYTE) NOT NULL -) -LOGGING -NOCOMPRESS -NOCACHE -; - -COMMENT ON COLUMN "C##FHBOOT"."BUS_SMSMANAGEMENT"."SMSNAME" IS '名称'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_SMSMANAGEMENT"."SMSCODE" IS '编码'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_SMSMANAGEMENT"."SMSTYPE" IS '类型'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_SMSMANAGEMENT"."ADDRESSEE" IS '收信人'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_SMSMANAGEMENT"."ISENABLE" IS '是否启用'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_SMSMANAGEMENT"."CORPINFO_ID" IS '企业ID'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_SMSMANAGEMENT"."OPDATE" IS '操作日期'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_SMSMANAGEMENT"."OPUSER" IS '操作人'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_SMSMANAGEMENT"."ISDELETE" IS '是否删除'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_SMSMANAGEMENT"."OPERATOR" IS '修改人'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_SMSMANAGEMENT"."OPERATTIME" IS '修改日期'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_SMSMANAGEMENT"."SMSMANAGEMENT_ID" IS 'ID'; - --- ---------------------------- --- Indexes structure for table BUS_SMSMANAGEMENT --- ---------------------------- - --- ---------------------------- --- Checks structure for table "C##FHBOOT"."BUS_SMSMANAGEMENT" - --- ---------------------------- - -ALTER TABLE "C##FHBOOT"."BUS_SMSMANAGEMENT" ADD CHECK ("SMSMANAGEMENT_ID" IS NOT NULL); - --- ---------------------------- --- Primary Key structure for table "C##FHBOOT"."BUS_SMSMANAGEMENT" --- ---------------------------- -ALTER TABLE "C##FHBOOT"."BUS_SMSMANAGEMENT" ADD PRIMARY KEY ("SMSMANAGEMENT_ID"); diff --git a/src/main/webapp/admin/createcode/code/sqlserver数据库脚本/BUS_PUBLICMETER.sql b/src/main/webapp/admin/createcode/code/sqlserver数据库脚本/BUS_PUBLICMETER.sql deleted file mode 100644 index b65fd1f9..00000000 --- a/src/main/webapp/admin/createcode/code/sqlserver数据库脚本/BUS_PUBLICMETER.sql +++ /dev/null @@ -1,25 +0,0 @@ -GO -/****** FHQQ313596790 ******/ -SET ANSI_NULLS ON -GO -SET QUOTED_IDENTIFIER ON -GO -CREATE TABLE BUS_PUBLICMETER ( - PUBLICMETER_ID nvarchar(100) NOT NULL, - PRECINCT_ID nvarchar(255) DEFAULT NULL, - NAME nvarchar(255) DEFAULT NULL, - CODE nvarchar(255) DEFAULT NULL, - DESCR nvarchar(255) DEFAULT NULL, - ISDELETE int NOT NULL, - CREATOR nvarchar(255) DEFAULT NULL, - CREATTIME nvarchar(32) DEFAULT NULL, - OPERATOR nvarchar(255) DEFAULT NULL, - OPERATTIME nvarchar(32) DEFAULT NULL, - TYPE int NOT NULL, - METERINDEX nvarchar(255) DEFAULT NULL, - CYCLE int NOT NULL, -PRIMARY KEY CLUSTERED -( - [PUBLICMETER_ID] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] diff --git a/src/main/webapp/admin/createcode/code/sqlserver数据库脚本/BUS_SMSMANAGEMENT.sql b/src/main/webapp/admin/createcode/code/sqlserver数据库脚本/BUS_SMSMANAGEMENT.sql deleted file mode 100644 index a8c7acd3..00000000 --- a/src/main/webapp/admin/createcode/code/sqlserver数据库脚本/BUS_SMSMANAGEMENT.sql +++ /dev/null @@ -1,24 +0,0 @@ -GO -/****** FHQQ313596790 ******/ -SET ANSI_NULLS ON -GO -SET QUOTED_IDENTIFIER ON -GO -CREATE TABLE BUS_SMSMANAGEMENT ( - SMSMANAGEMENT_ID nvarchar(100) NOT NULL, - SMSNAME nvarchar(255) DEFAULT NULL, - SMSCODE nvarchar(255) DEFAULT NULL, - SMSTYPE nvarchar(255) DEFAULT NULL, - ADDRESSEE nvarchar(255) DEFAULT NULL, - ISENABLE nvarchar(255) DEFAULT NULL, - CORPINFO_ID nvarchar(255) DEFAULT NULL, - OPDATE nvarchar(32) DEFAULT NULL, - OPUSER nvarchar(255) DEFAULT NULL, - ISDELETE nvarchar(255) DEFAULT NULL, - OPERATOR nvarchar(255) DEFAULT NULL, - OPERATTIME nvarchar(32) DEFAULT NULL, -PRIMARY KEY CLUSTERED -( - [SMSMANAGEMENT_ID] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] From eb56a0894cbab46f53d9c89e0f9e4b93b8d62373 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Thu, 18 Jan 2024 19:36:33 +0800 Subject: [PATCH 11/64] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/zcloud/util/HiddenExcelImgToSessionView.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/zcloud/util/HiddenExcelImgToSessionView.java b/src/main/java/com/zcloud/util/HiddenExcelImgToSessionView.java index 2366abae..52306ff6 100644 --- a/src/main/java/com/zcloud/util/HiddenExcelImgToSessionView.java +++ b/src/main/java/com/zcloud/util/HiddenExcelImgToSessionView.java @@ -19,6 +19,7 @@ import org.apache.poi.ss.usermodel.VerticalAlignment; import org.apache.poi.ss.usermodel.Workbook; import org.apache.shiro.session.Session; import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; import org.springframework.web.servlet.view.document.AbstractXlsView; import com.zcloud.entity.PageData; @@ -30,6 +31,7 @@ import net.coobird.thumbnailator.Thumbnails; * 作者：luoxiaobao * 官网：www.qdkjchina.com */ +@Component public class HiddenExcelImgToSessionView extends AbstractXlsView{ @Value("${http.file.url}") From a992cea275acf5f9896e52a3b255294b1980f624 Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 18 Jan 2024 20:25:27 +0800 Subject: [PATCH 12/64] =?UTF-8?q?=E4=B8=80=E8=88=AC=E9=9A=90=E6=82=A3?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6-=E6=8C=89=E5=88=97=E5=AF=BC=E5=87=BAbug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mybatis/datasource/bus/HiddenMapper.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml b/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml index 08c0fcfe..9f333adc 100644 --- a/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml @@ -875,11 +875,11 @@ (select group_concat(chr.NAME) from BUS_HIDDENCHECK bh left join sys_user chr on chr.USER_ID=bh.USER_ID where bh.HIDDEN_ID=f.HIDDEN_ID ) CHECKNAME from f - left join qa-gwj-prevention.`vi_user_all` cr on cr.USER_ID = f.CREATOR - left join qa-gwj-prevention.`vi_user_all` re on re.USER_ID = f.RECTIFICATIONOR - left join qa-gwj-prevention.`vi_user_all` ch on ch.USER_ID = f.CHECKOR - left join qa-gwj-prevention.`vi_user_all` rev on rev.USER_ID = f.REVIEWOR - left join qa-gwj-prevention.`vi_user_all` conUser on conUser.USER_ID = f.CONFIRM_USER + left join `qa-gwj-prevention`.`vi_user_all` cr on cr.USER_ID = f.CREATOR + left join `qa-gwj-prevention`.`vi_user_all` re on re.USER_ID = f.RECTIFICATIONOR + left join `qa-gwj-prevention`.`vi_user_all` ch on ch.USER_ID = f.CHECKOR + left join `qa-gwj-prevention`.`vi_user_all` rev on rev.USER_ID = f.REVIEWOR + left join `qa-gwj-prevention`.`vi_user_all` conUser on conUser.USER_ID = f.CONFIRM_USER left join oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT left join oa_department red on red.DEPARTMENT_ID = f.RECTIFICATIONDEPT left join oa_department chd on chd.DEPARTMENT_ID = f.CHECKDEPT From fa734f9c00c8dfcede3bf25e72868a6d5632256a Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Thu, 18 Jan 2024 21:11:49 +0800 Subject: [PATCH 13/64] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E8=B4=A3=E4=BB=BB?= =?UTF-8?q?=E7=8A=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml b/src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml index 039a12bc..be998e9e 100644 --- a/src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml @@ -187,7 +187,7 @@ f.PROMISE_ID,f.PROMISE_NAME,f.TEXT,f.TYPE from `qa-gwj-regulatory`.BUS_PROMISE f - where 1=1 and f.ISDELETE = 0 + where 1=1 and f.ISDELETE = 0 and f.TYPE = '0' and f.PROMISE_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') From b393a6164aecf4fb549a65caf8bd24eddce2c93f Mon Sep 17 00:00:00 2001 From: liujun Date: Fri, 19 Jan 2024 16:11:49 +0800 Subject: [PATCH 14/64] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=94=BE=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=B5=81=E7=A8=8B=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/datasource/xgf/XgfFlowsMapper.java | 24 ++ .../zcloud/service/xgf/XgfUserService.java | 2 + .../service/xgf/impl/XgfUserServiceImpl.java | 247 +++++++++++-- .../mybatis/datasource/xgf/XgfFlowsMapper.xml | 336 ++++++++++++++++++ .../datasource/xgf/XgfUserDetailsMapper.xml | 49 +-- .../mybatis/datasource/xgf/XgfUserMapper.xml | 34 +- 6 files changed, 614 insertions(+), 78 deletions(-) create mode 100644 src/main/java/com/zcloud/mapper/datasource/xgf/XgfFlowsMapper.java create mode 100644 src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml diff --git a/src/main/java/com/zcloud/mapper/datasource/xgf/XgfFlowsMapper.java b/src/main/java/com/zcloud/mapper/datasource/xgf/XgfFlowsMapper.java new file mode 100644 index 00000000..4710f34d --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/xgf/XgfFlowsMapper.java @@ -0,0 +1,24 @@ +package com.zcloud.mapper.datasource.xgf; + +import java.util.List; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +/** + * 相关方人员审批信息列表(XgfFlows)表数据库访问层 + * + * @author liu jun + * @since 2024-01-19 12:24:00 + */ +public interface XgfFlowsMapper { + int save(PageData entity); + + int delete(PageData entity); + + int edit(PageData pd); + + List datalistPage(Page page); + + PageData findById(PageData condition); +} + diff --git a/src/main/java/com/zcloud/service/xgf/XgfUserService.java b/src/main/java/com/zcloud/service/xgf/XgfUserService.java index 47ee65ad..2e947dfa 100644 --- a/src/main/java/com/zcloud/service/xgf/XgfUserService.java +++ b/src/main/java/com/zcloud/service/xgf/XgfUserService.java @@ -26,4 +26,6 @@ public interface XgfUserService { List findRecordList(PageData condition) throws Exception; List getAppointApproveList(Page page); + + void approveAppoint(PageData request) throws Exception; } diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index 2321c4db..1684043a 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -2,6 +2,7 @@ package com.zcloud.service.xgf.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.bus.CorpInfoMapper; import com.zcloud.mapper.datasource.xgf.*; import com.zcloud.service.bus.CorpInfoService; import com.zcloud.service.system.DepartmentService; @@ -36,6 +37,12 @@ public class XgfUserServiceImpl implements XgfUserService { @Resource private FlowDetailMapper flowDetailMapper; + @Resource + private XgfFlowsMapper xgfFlowsMapper; + + @Resource + private CorpInfoMapper corpInfoMapper; + @Value("${preventionxgf.api.url}") private String prevention_xgf_url; @@ -70,7 +77,8 @@ public class XgfUserServiceImpl implements XgfUserService { x.put("XGF_USER_NAME", x.get("NAME")); x.put("VALID_FLAG", "1"); x.put("STATUS", "1"); - x.put("CHECK_STATUS","0"); + x.put("CHECK_STATUS", "0"); + x.put("CHECK_STEP", 1); x.put("CREATED_TIME", DateUtil.getTime()); x.put("OPERATOR_TIME", DateUtil.getTime()); x.put("IS_DELETE", "0"); @@ -117,7 +125,8 @@ public class XgfUserServiceImpl implements XgfUserService { x.put("IS_DELETE", "0"); x.put("VALID_FLAG", "1"); x.put("STATUS", "1"); - x.put("CHECK_STATUS","0"); + x.put("CHECK_STATUS", "0"); + x.put("CHECK_STEP", 1); if ("2".equals(x.getString("STUDY_STATUS"))) { x.put("STUDY_STATUS", "2"); } else { @@ -130,6 +139,43 @@ public class XgfUserServiceImpl implements XgfUserService { } /* 2、保存相关方人员流程审批信息 */ condition.clear(); + condition.put("FLOWS_ID", x.getString("USER_ID")); + PageData flows = xgfFlowsMapper.findById(condition); + if (flows == null || flows.size() <= 0) { + flows = new PageData(); + flows.put("FLOWS_ID", x.getString("USER_ID")); + flows.put("FLOWS_STEP", 1); + flows.put("FOREIGN_KEY_ID", x.getString("USER_ID")); + flows.put("FOREIGN_KEY_NAME", "xgf_user=>XGF_USER_ID"); + flows.put("APPOINT_ZERO_CORP_ID", x.getString("CORPINFO_ID")); + condition.clear(); + condition.put("CORPINFO_ID", x.getString("CORPINFO_ID")); + PageData corpInfo = corpInfoMapper.findById(condition); + if (corpInfo != null && corpInfo.size() > 0) { + flows.put("APPOINT_ZERO_CORP_NAME", corpInfo.getString("NAME")); + } + flows.put("APPOINT_ZERO_DEPARTMENT_ID", x.getString("APPOINT_ZERO_DEPARTMENT_ID")); + flows.put("APPOINT_ZERO_DEPARTMENT_NAME", x.getString("APPOINT_ZERO_DEPARTMENT_NAME")); + flows.put("APPOINT_ZERO_USER_ID", x.getString("APPOINT_ZERO_USER_ID")); + flows.put("APPOINT_ZERO_USER_NAME", x.getString("APPOINT_ZERO_USER_NAME")); + xgfFlowsMapper.save(flows); + } else { + flows.put("APPOINT_ZERO_CORP_ID", x.getString("CORPINFO_ID")); + flows.put("FLOWS_STEP", 1); + condition.clear(); + condition.put("CORPINFO_ID", x.getString("CORPINFO_ID")); + PageData corpInfo = corpInfoMapper.findById(condition); + if (corpInfo != null && corpInfo.size() > 0) { + flows.put("APPOINT_ZERO_CORP_NAME", corpInfo.getString("NAME")); + } + flows.put("APPOINT_ZERO_DEPARTMENT_ID", x.getString("APPOINT_ZERO_DEPARTMENT_ID")); + flows.put("APPOINT_ZERO_DEPARTMENT_NAME", x.getString("APPOINT_ZERO_DEPARTMENT_NAME")); + flows.put("APPOINT_ZERO_USER_ID", x.getString("APPOINT_ZERO_USER_ID")); + flows.put("APPOINT_ZERO_USER_NAME", x.getString("APPOINT_ZERO_USER_NAME")); + xgfFlowsMapper.edit(flows); + } + /* 3、流程记录 */ + condition.clear(); condition.put("FOREIGN_KEY", x.getString("XGF_USER_ID")); condition.put("TYPE", "1"); condition.put("VALID_FLAG", "1"); @@ -227,19 +273,8 @@ public class XgfUserServiceImpl implements XgfUserService { if ("1".equals(request.getString("STATUS"))) { entity.put("STATUS", "1"); entity.put("VALID_FLAG", "1"); - entity.put("CHECK_STATUS","1"); - condition.clear(); - condition.put("XFG_USER_DETAILS_ID", x); - PageData userInfo = xgfUserDetailsMapper.findById(condition); - if (userInfo == null || userInfo.size() == 0) { - throw new RuntimeException("未找到该用户详细信息"); - } - // 企业端人员审核完成后，指定企业端监管部门，中的某人进行审核 - userInfo.put("APPOINT_DEPARTMENT_ID", request.getString("APPOINT_DEPARTMENT_ID")); - userInfo.put("APPOINT_DEPARTMENT_NAME", request.getString("APPOINT_DEPARTMENT_NAME")); - userInfo.put("APPOINT_USER_ID", request.getString("APPOINT_USER_ID")); - userInfo.put("APPOINT_USER_NAME", request.getString("APPOINT_USER_NAME")); - xgfUserDetailsMapper.edit(userInfo); + entity.put("CHECK_STATUS", "1"); + entity.put("CHECK_STEP", 2); } else { entity.put("STATUS", "0"); PageData key = new PageData(); @@ -250,15 +285,33 @@ public class XgfUserServiceImpl implements XgfUserService { if (result == null || !"succeed".equals(result.get("result"))) { throw new RuntimeException("请求失败"); } + } + /* 保存审批信息 */ + condition.clear(); + condition.put("FLOWS_ID", x); + PageData flows = xgfFlowsMapper.findById(condition); + if (flows == null || flows.size() == 0) { + throw new RuntimeException("未找到该用户详细信息"); + } + condition.clear(); + condition.put("STATUS", request.getString("STATUS")); + condition.put("APPOINT_CORP_ID", request.getString("APPOINT_CORP_ID")); + condition.put("APPOINT_CORP_NAME", request.getString("APPOINT_CORP_NAME")); + condition.put("APPOINT_DEPARTMENT_ID", request.getString("APPOINT_DEPARTMENT_ID")); + condition.put("APPOINT_DEPARTMENT_NAME", request.getString("APPOINT_DEPARTMENT_NAME")); + condition.put("APPOINT_USER_ID", request.getString("APPOINT_USER_ID")); + condition.put("APPOINT_USER_NAME", request.getString("APPOINT_USER_NAME")); + handle(condition, flows); + xgfUserMapper.edit(entity); - /* 保存审批流程明细信息 */ + /* 保存审批记录 */ condition.clear(); condition.put("FOREIGN_KEY", entity.getString("XGF_USER_ID")); condition.put("TYPE", "1"); condition.put("VALID_FLAG", "1"); PageData flow = flowMapper.findByCondition(condition); - if (flow == null || flow.size() == 0){ + if (flow == null || flow.size() == 0) { throw new RuntimeException("未找到该用户审批流程"); } condition.clear(); @@ -274,7 +327,12 @@ public class XgfUserServiceImpl implements XgfUserService { nextNode.put("APPROVER_NAME", Jurisdiction.getName()); nextNode.put("APPROVER_TIME", DateUtil.getTime()); nextNode.put("APPROVER_CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - nextNode.put("APPROVER_CORPINFO_NAME", ""); + condition.clear(); + condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData corpInfo = corpInfoMapper.findById(condition); + if (corpInfo != null && corpInfo.size() > 0) { + nextNode.put("APPROVER_CORPINFO_NAME", corpInfo.getString("NAME")); + } nextNode.put("PASS_FLAG", request.getString("STATUS")); nextNode.put("END_FLAG", "0"); nextNode.put("ISDELETE", "0"); @@ -299,10 +357,157 @@ public class XgfUserServiceImpl implements XgfUserService { public List getAppointApproveList(Page page) { List list = xgfUserMapper.appointlistPage(page); for (PageData x : list) { - if (StringUtils.isNotBlank(x.getString("APPOINT_USER_ID"))) { - // TODO 判断当前人是否有权限审批 - } + x.put("power_flag", getPower(x)); } return list; } + + @Override + public void approveAppoint(PageData request) throws Exception { + PageData condition = new PageData(); + condition.put("XGF_USER_ID",request.getString("XGF_USER_ID")); + PageData userInfo = xgfUserMapper.findById(condition); + if (userInfo == null || userInfo.size() == 0) { + throw new RuntimeException("未找到该用户"); + } + condition.clear(); + condition.put("FLOWS_ID", userInfo.getString("XGF_USER_ID")); + PageData flows = xgfFlowsMapper.findById(condition); + if (flows == null || flows.size() == 0) { + throw new RuntimeException("未找到该用户详审批信息"); + } + handle(request,flows); + } + + /* 获取当前用户是否有权限审批 */ + private String getPower(PageData x) { + switch (Integer.parseInt(x.get("CHECK_STEP").toString())) { + case 1: + if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_ONE_USER_ID"))) { + return "1"; + } + case 2: + if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_TWO_USER_ID"))) { + return "1"; + } + case 3: + if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_THREE_USER_ID"))) { + return "1"; + } + case 4: + if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_FOUR_USER_ID"))) { + return "1"; + } + case 5: + if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_FIVE_USER_ID"))) { + return "1"; + } + case 6: + if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_SIX_USER_ID"))) { + return "1"; + } + case 7: + if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_SEVEN_USER_ID"))) { + return "1"; + } + default: + return "0"; + } + } + + void handle(PageData info, PageData flows) throws Exception{ + switch (Integer.parseInt(flows.get("FLOWS_STEP").toString())) { + case 1: + flows.put("APPOINT_ONE_CORP_ID", info.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_ONE_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_ONE_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_ONE_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_ONE_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_ONE_USER_NAME", info.getString("APPOINT_USER_NAME")); + flows.put("APPOINT_ONE_TIME", DateUtil.getTime()); + flows.put("APPOINT_ONE_STATUS", info.getString("STATUS")); + flows.put("APPOINT_ONE_OPINION", info.getString("OPINION")); + flows.put("FLOWS_STEP", 2); + xgfFlowsMapper.edit(flows); + break; + case 2: + flows.put("APPOINT_TWO_CORP_ID", info.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_TWO_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_TWO_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_TWO_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_TWO_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_TWO_USER_NAME", info.getString("APPOINT_USER_NAME")); + flows.put("APPOINT_TWO_TIME", DateUtil.getTime()); + flows.put("APPOINT_TWO_STATUS", info.getString("STATUS")); + flows.put("APPOINT_TWO_OPINION", info.getString("OPINION")); + flows.put("FLOWS_STEP", 3); + xgfFlowsMapper.edit(flows); + break; + case 3: + flows.put("APPOINT_THREE_CORP_ID", info.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_THREE_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_THREE_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_THREE_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_THREE_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_THREE_USER_NAME", info.getString("APPOINT_USER_NAME")); + flows.put("APPOINT_THREE_TIME", DateUtil.getTime()); + flows.put("APPOINT_THREE_STATUS", info.getString("STATUS")); + flows.put("APPOINT_THREE_OPINION", info.getString("OPINION")); + flows.put("FLOWS_STEP", 4); + xgfFlowsMapper.edit(flows); + break; + case 4: + flows.put("APPOINT_FOUR_CORP_ID", info.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_FOUR_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_FOUR_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_FOUR_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_FOUR_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_FOUR_USER_NAME", info.getString("APPOINT_USER_NAME")); + flows.put("APPOINT_FOUR_TIME", DateUtil.getTime()); + flows.put("APPOINT_FOUR_STATUS", info.getString("STATUS")); + flows.put("APPOINT_FOUR_OPINION", info.getString("OPINION")); + flows.put("FLOWS_STEP", 5); + xgfFlowsMapper.edit(flows); + break; + case 5: + flows.put("APPOINT_FIVE_CORP_ID", info.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_FIVE_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_FIVE_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_FIVE_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_FIVE_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_FIVE_USER_NAME", info.getString("APPOINT_USER_NAME")); + flows.put("APPOINT_FIVE_TIME", DateUtil.getTime()); + flows.put("APPOINT_FIVE_STATUS", info.getString("STATUS")); + flows.put("APPOINT_FIVE_OPINION", info.getString("OPINION")); + flows.put("FLOWS_STEP", 6); + xgfFlowsMapper.edit(flows); + break; + case 6: + flows.put("APPOINT_SIX_CORP_ID", info.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_SIX_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_SIX_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_SIX_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_SIX_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_SIX_USER_NAME", info.getString("APPOINT_USER_NAME")); + flows.put("APPOINT_SIX_TIME", DateUtil.getTime()); + flows.put("APPOINT_SIX_STATUS", info.getString("STATUS")); + flows.put("APPOINT_SIX_OPINION", info.getString("OPINION")); + flows.put("FLOWS_STEP", 7); + xgfFlowsMapper.edit(flows); + break; + case 7: + flows.put("APPOINT_SEVEN_CORP_ID", info.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_SEVEN_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_SEVEN_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_SEVEN_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_SEVEN_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_SEVEN_USER_NAME", info.getString("APPOINT_USER_NAME")); + flows.put("APPOINT_SEVEN_TIME", DateUtil.getTime()); + flows.put("APPOINT_SEVEN_STATUS", info.getString("STATUS")); + flows.put("APPOINT_SEVEN_OPINION", info.getString("OPINION")); + flows.put("FLOWS_STEP", 8); + xgfFlowsMapper.edit(flows); + break; + } + } } diff --git a/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml new file mode 100644 index 00000000..a9f52371 --- /dev/null +++ b/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml @@ -0,0 +1,336 @@ + + + + + + xgf_flows + + + + f.FLOWS_ID, + f.FOREIGN_KEY_ID, + f.FOREIGN_KEY_NAME, + f.FLOWS_STEP, + f.IS_DELETE, + f.APPOINT_ZERO_CORP_ID, + f.APPOINT_ZERO_CORP_TYEP, + f.APPOINT_ZERO_CORP_NAME, + f.APPOINT_ZERO_DEPARTMENT_ID, + f.APPOINT_ZERO_DEPARTMENT_NAME, + f.APPOINT_ZERO_USER_ID, + f.APPOINT_ZERO_USER_NAME, + f.APPOINT_ZERO_STATUS, + f.APPOINT_ZERO_OPINION, + f.APPOINT_ZERO_TIME, + f.APPOINT_ONE_CORP_ID, + f.APPOINT_ONE_CORP_NAME, + f.APPOINT_ONE_CORP_TYEP, + f.APPOINT_ONE_DEPARTMENT_ID, + f.APPOINT_ONE_DEPARTMENT_NAME, + f.APPOINT_ONE_USER_ID, + f.APPOINT_ONE_USER_NAME, + f.APPOINT_ONE_STATUS, + f.APPOINT_ONE_OPINION, + f.APPOINT_ONE_TIME, + f.APPOINT_TWO_CORP_ID, + f.APPOINT_TWO_CORP_NAME, + f.APPOINT_TWO_DEPARTMENT_ID, + f.APPOINT_TWO_DEPARTMENT_NAME, + f.APPOINT_TWO_USER_ID, + f.APPOINT_TWO_USER_NAME, + f.APPOINT_TWO_TIME, + f.APPOINT_THREE_CORP_ID, + f.APPOINT_THREE_CORP_NAME, + f.APPOINT_THREE_DEPARTMENT_ID, + f.APPOINT_THREE_DEPARTMENT_NAME, + f.APPOINT_THREE_USER_ID, + f.APPOINT_THREE_USER_NAME, + f.APPOINT_THREE_STATUS, + f.APPOINT_THREE_OPINION, + f.APPOINT_THREE_TIME, + f.APPOINT_FOUR_CORP_ID, + f.APPOINT_FOUR_CORP_NAME, + f.APPOINT_FOUR_DEPARTMENT_ID, + f.APPOINT_FOUR_DEPARTMENT_NAME, + f.APPOINT_FOUR_USER_ID, + f.APPOINT_FOUR_USER_NAME, + f.APPOINT_FOUR_STATUS, + f.APPOINT_FOUR_OPINION, + f.APPOINT_FIVE_CORP_ID, + f.APPOINT_FIVE_CORP_NAME, + f.APPOINT_FIVE_DEPARTMENT_ID, + f.APPOINT_FIVE_DEPARTMENT_NAME, + f.APPOINT_FIVE_USER_ID, + f.APPOINT_FIVE_USER_NAME, + f.APPOINT_FIVE_STATUS, + f.APPOINT_FIVE_OPINION, + f.APPOINT_SIX_CORP_ID, + f.APPOINT_SIX_CORP_NAME, + f.APPOINT_SIX_DEPARTMENT_ID, + f.APPOINT_SIX_DEPARTMENT_NAME, + f.APPOINT_SIX_USER_ID, + f.APPOINT_SIX_USER_NAME, + f.APPOINT_SIX_STATUS, + f.APPOINT_SIX_OPINION, + f.APPOINT_SEVEN_CORP_ID, + f.APPOINT_SEVEN_CORP_NAME, + f.APPOINT_SEVEN_DEPARTMENT_ID, + f.APPOINT_SEVEN_DEPARTMENT_NAME, + f.APPOINT_SEVEN_USER_ID, + f.APPOINT_SEVEN_USER_NAME, + f.APPOINT_SEVEN_STATUS, + f.APPOINT_SEVEN_OPINION + + + + FLOWS_ID, + FOREIGN_KEY_ID, + FOREIGN_KEY_NAME, + FLOWS_STEP, + IS_DELETE, + APPOINT_ZERO_CORP_ID, + APPOINT_ZERO_CORP_TYEP, + APPOINT_ZERO_CORP_NAME, + APPOINT_ZERO_DEPARTMENT_ID, + APPOINT_ZERO_DEPARTMENT_NAME, + APPOINT_ZERO_USER_ID, + APPOINT_ZERO_USER_NAME, + APPOINT_ZERO_STATUS, + APPOINT_ZERO_OPINION, + APPOINT_ZERO_TIME, + APPOINT_ONE_CORP_ID, + APPOINT_ONE_CORP_NAME, + APPOINT_ONE_CORP_TYEP, + APPOINT_ONE_DEPARTMENT_ID, + APPOINT_ONE_DEPARTMENT_NAME, + APPOINT_ONE_USER_ID, + APPOINT_ONE_USER_NAME, + APPOINT_ONE_STATUS, + APPOINT_ONE_OPINION, + APPOINT_ONE_TIME, + APPOINT_TWO_CORP_ID, + APPOINT_TWO_CORP_NAME, + APPOINT_TWO_DEPARTMENT_ID, + APPOINT_TWO_DEPARTMENT_NAME, + APPOINT_TWO_USER_ID, + APPOINT_TWO_USER_NAME, + APPOINT_TWO_TIME, + APPOINT_THREE_CORP_ID, + APPOINT_THREE_CORP_NAME, + APPOINT_THREE_DEPARTMENT_ID, + APPOINT_THREE_DEPARTMENT_NAME, + APPOINT_THREE_USER_ID, + APPOINT_THREE_USER_NAME, + APPOINT_THREE_STATUS, + APPOINT_THREE_OPINION, + APPOINT_THREE_TIME, + APPOINT_FOUR_CORP_ID, + APPOINT_FOUR_CORP_NAME, + APPOINT_FOUR_DEPARTMENT_ID, + APPOINT_FOUR_DEPARTMENT_NAME, + APPOINT_FOUR_USER_ID, + APPOINT_FOUR_USER_NAME, + APPOINT_FOUR_STATUS, + APPOINT_FOUR_OPINION, + APPOINT_FIVE_CORP_ID, + APPOINT_FIVE_CORP_NAME, + APPOINT_FIVE_DEPARTMENT_ID, + APPOINT_FIVE_DEPARTMENT_NAME, + APPOINT_FIVE_USER_ID, + APPOINT_FIVE_USER_NAME, + APPOINT_FIVE_STATUS, + APPOINT_FIVE_OPINION, + APPOINT_SIX_CORP_ID, + APPOINT_SIX_CORP_NAME, + APPOINT_SIX_DEPARTMENT_ID, + APPOINT_SIX_DEPARTMENT_NAME, + APPOINT_SIX_USER_ID, + APPOINT_SIX_USER_NAME, + APPOINT_SIX_STATUS, + APPOINT_SIX_OPINION, + APPOINT_SEVEN_CORP_ID, + APPOINT_SEVEN_CORP_NAME, + APPOINT_SEVEN_DEPARTMENT_ID, + APPOINT_SEVEN_DEPARTMENT_NAME, + APPOINT_SEVEN_USER_ID, + APPOINT_SEVEN_USER_NAME, + APPOINT_SEVEN_STATUS, + APPOINT_SEVEN_OPINION + + + + #{FLOWS_ID}, + #{FOREIGN_KEY_ID}, + #{FOREIGN_KEY_NAME}, + #{FLOWS_STEP}, + #{IS_DELETE}, + #{APPOINT_ZERO_CORP_ID}, + #{APPOINT_ZERO_CORP_TYEP}, + #{APPOINT_ZERO_CORP_NAME}, + #{APPOINT_ZERO_DEPARTMENT_ID}, + #{APPOINT_ZERO_DEPARTMENT_NAME}, + #{APPOINT_ZERO_USER_ID}, + #{APPOINT_ZERO_USER_NAME}, + #{APPOINT_ZERO_STATUS}, + #{APPOINT_ZERO_OPINION}, + #{APPOINT_ZERO_TIME}, + #{APPOINT_ONE_CORP_ID}, + #{APPOINT_ONE_CORP_NAME}, + #{APPOINT_ONE_CORP_TYEP}, + #{APPOINT_ONE_DEPARTMENT_ID}, + #{APPOINT_ONE_DEPARTMENT_NAME}, + #{APPOINT_ONE_USER_ID}, + #{APPOINT_ONE_USER_NAME}, + #{APPOINT_ONE_STATUS}, + #{APPOINT_ONE_OPINION}, + #{APPOINT_ONE_TIME}, + #{APPOINT_TWO_CORP_ID}, + #{APPOINT_TWO_CORP_NAME}, + #{APPOINT_TWO_DEPARTMENT_ID}, + #{APPOINT_TWO_DEPARTMENT_NAME}, + #{APPOINT_TWO_USER_ID}, + #{APPOINT_TWO_USER_NAME}, + #{APPOINT_TWO_TIME}, + #{APPOINT_THREE_CORP_ID}, + #{APPOINT_THREE_CORP_NAME}, + #{APPOINT_THREE_DEPARTMENT_ID}, + #{APPOINT_THREE_DEPARTMENT_NAME}, + #{APPOINT_THREE_USER_ID}, + #{APPOINT_THREE_USER_NAME}, + #{APPOINT_THREE_STATUS}, + #{APPOINT_THREE_OPINION}, + #{APPOINT_THREE_TIME}, + #{APPOINT_FOUR_CORP_ID}, + #{APPOINT_FOUR_CORP_NAME}, + #{APPOINT_FOUR_DEPARTMENT_ID}, + #{APPOINT_FOUR_DEPARTMENT_NAME}, + #{APPOINT_FOUR_USER_ID}, + #{APPOINT_FOUR_USER_NAME}, + #{APPOINT_FOUR_STATUS}, + #{APPOINT_FOUR_OPINION}, + #{APPOINT_FIVE_CORP_ID}, + #{APPOINT_FIVE_CORP_NAME}, + #{APPOINT_FIVE_DEPARTMENT_ID}, + #{APPOINT_FIVE_DEPARTMENT_NAME}, + #{APPOINT_FIVE_USER_ID}, + #{APPOINT_FIVE_USER_NAME}, + #{APPOINT_FIVE_STATUS}, + #{APPOINT_FIVE_OPINION}, + #{APPOINT_SIX_CORP_ID}, + #{APPOINT_SIX_CORP_NAME}, + #{APPOINT_SIX_DEPARTMENT_ID}, + #{APPOINT_SIX_DEPARTMENT_NAME}, + #{APPOINT_SIX_USER_ID}, + #{APPOINT_SIX_USER_NAME}, + #{APPOINT_SIX_STATUS}, + #{APPOINT_SIX_OPINION}, + #{APPOINT_SEVEN_CORP_ID}, + #{APPOINT_SEVEN_CORP_NAME}, + #{APPOINT_SEVEN_DEPARTMENT_ID}, + #{APPOINT_SEVEN_DEPARTMENT_NAME}, + #{APPOINT_SEVEN_USER_ID}, + #{APPOINT_SEVEN_USER_NAME}, + #{APPOINT_SEVEN_STATUS}, + #{APPOINT_SEVEN_OPINION} + + + + + insert into xgf_flows () values () + + + + + delete from xgf_flows where FLOWS_ID = #{FLOWS_ID} + + + + + update xgf_flows set + FLOWS_ID = #{FLOWS_ID}, + FOREIGN_KEY_ID = #{FOREIGN_KEY_ID}, + FOREIGN_KEY_NAME = #{FOREIGN_KEY_NAME}, + FLOWS_STEP = #{FLOWS_STEP}, + IS_DELETE = #{IS_DELETE}, + APPOINT_ZERO_CORP_ID = #{APPOINT_ZERO_CORP_ID}, + APPOINT_ZERO_CORP_TYEP = #{APPOINT_ZERO_CORP_TYEP}, + APPOINT_ZERO_CORP_NAME = #{APPOINT_ZERO_CORP_NAME}, + APPOINT_ZERO_DEPARTMENT_ID = #{APPOINT_ZERO_DEPARTMENT_ID}, + APPOINT_ZERO_DEPARTMENT_NAME = #{APPOINT_ZERO_DEPARTMENT_NAME}, + APPOINT_ZERO_USER_ID = #{APPOINT_ZERO_USER_ID}, + APPOINT_ZERO_USER_NAME = #{APPOINT_ZERO_USER_NAME}, + APPOINT_ZERO_STATUS = #{APPOINT_ZERO_STATUS}, + APPOINT_ZERO_OPINION = #{APPOINT_ZERO_OPINION}, + APPOINT_ZERO_TIME = #{APPOINT_ZERO_TIME}, + APPOINT_ONE_CORP_ID = #{APPOINT_ONE_CORP_ID}, + APPOINT_ONE_CORP_NAME = #{APPOINT_ONE_CORP_NAME}, + APPOINT_ONE_CORP_TYEP = #{APPOINT_ONE_CORP_TYEP}, + APPOINT_ONE_DEPARTMENT_ID = #{APPOINT_ONE_DEPARTMENT_ID}, + APPOINT_ONE_DEPARTMENT_NAME = #{APPOINT_ONE_DEPARTMENT_NAME}, + APPOINT_ONE_USER_ID = #{APPOINT_ONE_USER_ID}, + APPOINT_ONE_USER_NAME = #{APPOINT_ONE_USER_NAME}, + APPOINT_ONE_STATUS = #{APPOINT_ONE_STATUS}, + APPOINT_ONE_OPINION = #{APPOINT_ONE_OPINION}, + APPOINT_ONE_TIME = #{APPOINT_ONE_TIME}, + APPOINT_TWO_CORP_ID = #{APPOINT_TWO_CORP_ID}, + APPOINT_TWO_CORP_NAME = #{APPOINT_TWO_CORP_NAME}, + APPOINT_TWO_DEPARTMENT_ID = #{APPOINT_TWO_DEPARTMENT_ID}, + APPOINT_TWO_DEPARTMENT_NAME = #{APPOINT_TWO_DEPARTMENT_NAME}, + APPOINT_TWO_USER_ID = #{APPOINT_TWO_USER_ID}, + APPOINT_TWO_USER_NAME = #{APPOINT_TWO_USER_NAME}, + APPOINT_TWO_TIME = #{APPOINT_TWO_TIME}, + APPOINT_THREE_CORP_ID = #{APPOINT_THREE_CORP_ID}, + APPOINT_THREE_CORP_NAME = #{APPOINT_THREE_CORP_NAME}, + APPOINT_THREE_DEPARTMENT_ID = #{APPOINT_THREE_DEPARTMENT_ID}, + APPOINT_THREE_DEPARTMENT_NAME = #{APPOINT_THREE_DEPARTMENT_NAME}, + APPOINT_THREE_USER_ID = #{APPOINT_THREE_USER_ID}, + APPOINT_THREE_USER_NAME = #{APPOINT_THREE_USER_NAME}, + APPOINT_THREE_STATUS = #{APPOINT_THREE_STATUS}, + APPOINT_THREE_OPINION = #{APPOINT_THREE_OPINION}, + APPOINT_THREE_TIME = #{APPOINT_THREE_TIME}, + APPOINT_FOUR_CORP_ID = #{APPOINT_FOUR_CORP_ID}, + APPOINT_FOUR_CORP_NAME = #{APPOINT_FOUR_CORP_NAME}, + APPOINT_FOUR_DEPARTMENT_ID = #{APPOINT_FOUR_DEPARTMENT_ID}, + APPOINT_FOUR_DEPARTMENT_NAME = #{APPOINT_FOUR_DEPARTMENT_NAME}, + APPOINT_FOUR_USER_ID = #{APPOINT_FOUR_USER_ID}, + APPOINT_FOUR_USER_NAME = #{APPOINT_FOUR_USER_NAME}, + APPOINT_FOUR_STATUS = #{APPOINT_FOUR_STATUS}, + APPOINT_FOUR_OPINION = #{APPOINT_FOUR_OPINION}, + APPOINT_FIVE_CORP_ID = #{APPOINT_FIVE_CORP_ID}, + APPOINT_FIVE_CORP_NAME = #{APPOINT_FIVE_CORP_NAME}, + APPOINT_FIVE_DEPARTMENT_ID = #{APPOINT_FIVE_DEPARTMENT_ID}, + APPOINT_FIVE_DEPARTMENT_NAME = #{APPOINT_FIVE_DEPARTMENT_NAME}, + APPOINT_FIVE_USER_ID = #{APPOINT_FIVE_USER_ID}, + APPOINT_FIVE_USER_NAME = #{APPOINT_FIVE_USER_NAME}, + APPOINT_FIVE_STATUS = #{APPOINT_FIVE_STATUS}, + APPOINT_FIVE_OPINION = #{APPOINT_FIVE_OPINION}, + APPOINT_SIX_CORP_ID = #{APPOINT_SIX_CORP_ID}, + APPOINT_SIX_CORP_NAME = #{APPOINT_SIX_CORP_NAME}, + APPOINT_SIX_DEPARTMENT_ID = #{APPOINT_SIX_DEPARTMENT_ID}, + APPOINT_SIX_DEPARTMENT_NAME = #{APPOINT_SIX_DEPARTMENT_NAME}, + APPOINT_SIX_USER_ID = #{APPOINT_SIX_USER_ID}, + APPOINT_SIX_USER_NAME = #{APPOINT_SIX_USER_NAME}, + APPOINT_SIX_STATUS = #{APPOINT_SIX_STATUS}, + APPOINT_SIX_OPINION = #{APPOINT_SIX_OPINION}, + APPOINT_SEVEN_CORP_ID = #{APPOINT_SEVEN_CORP_ID}, + APPOINT_SEVEN_CORP_NAME = #{APPOINT_SEVEN_CORP_NAME}, + APPOINT_SEVEN_DEPARTMENT_ID = #{APPOINT_SEVEN_DEPARTMENT_ID}, + APPOINT_SEVEN_DEPARTMENT_NAME = #{APPOINT_SEVEN_DEPARTMENT_NAME}, + APPOINT_SEVEN_USER_ID = #{APPOINT_SEVEN_USER_ID}, + APPOINT_SEVEN_USER_NAME = #{APPOINT_SEVEN_USER_NAME}, + APPOINT_SEVEN_STATUS = #{APPOINT_SEVEN_STATUS}, + APPOINT_SEVEN_OPINION = #{APPOINT_SEVEN_OPINION} + where a.FLOWS_ID = #{FLOWS_ID} + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml index 3115441f..0c1343c9 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml @@ -63,18 +63,7 @@ f.IS_BF, f.IS_SOCIAL, f.SOCIAL_NUMBER, - f.zzName, - f.APPOINT_DEPARTMENT_ID, - f.APPOINT_DEPARTMENT_NAME, - f.APPOINT_USER_ID, - f.APPOINT_USER_NAME, - f.APPOINT_ONE_CORP_ID, - f.APPOINT_ONE_CORP_NAME, - f.APPOINT_ONE_DEPARTMENT_ID, - f.APPOINT_ONE_DEPARTMENT_NAME, - f.APPOINT_ONE_USER_ID, - f.APPOINT_ONE_USER_NAME - + f.zzName @@ -133,17 +122,7 @@ IS_BF, IS_SOCIAL, SOCIAL_NUMBER, - zzName, - APPOINT_DEPARTMENT_ID, - APPOINT_DEPARTMENT_NAME, - APPOINT_USER_ID, - APPOINT_USER_NAME, - APPOINT_ONE_CORP_ID, - APPOINT_ONE_CORP_NAME, - APPOINT_ONE_DEPARTMENT_ID, - APPOINT_ONE_DEPARTMENT_NAME, - APPOINT_ONE_USER_ID, - APPOINT_ONE_USER_NAME + zzName @@ -202,17 +181,7 @@ #{IS_BF}, #{IS_SOCIAL}, #{SOCIAL_NUMBER}, - #{zzName}, - #{APPOINT_DEPARTMENT_ID}, - #{APPOINT_DEPARTMENT_NAME}, - #{APPOINT_USER_ID}, - #{APPOINT_USER_NAME}, - #{APPOINT_ONE_CORP_ID}, - #{APPOINT_ONE_CORP_NAME}, - #{APPOINT_ONE_DEPARTMENT_ID}, - #{APPOINT_ONE_DEPARTMENT_NAME}, - #{APPOINT_ONE_USER_ID}, - #{APPOINT_ONE_USER_NAME} + #{zzName} @@ -295,17 +264,7 @@ IS_BF = #{IS_BF}, IS_SOCIAL = #{IS_SOCIAL}, SOCIAL_NUMBER = #{SOCIAL_NUMBER}, - zzName = #{zzName}, - APPOINT_DEPARTMENT_ID = #{APPOINT_DEPARTMENT_ID}, - APPOINT_DEPARTMENT_NAME = #{APPOINT_DEPARTMENT_NAME}, - APPOINT_USER_ID = #{APPOINT_USER_ID}, - APPOINT_USER_NAME = #{APPOINT_USER_NAME}, - APPOINT_ONE_CORP_ID = #{APPOINT_ONE_CORP_ID}, - APPOINT_ONE_CORP_NAME = #{APPOINT_ONE_CORP_NAME}, - APPOINT_ONE_DEPARTMENT_ID = #{APPOINT_ONE_DEPARTMENT_ID}, - APPOINT_ONE_DEPARTMENT_NAME = #{APPOINT_ONE_DEPARTMENT_NAME}, - APPOINT_ONE_USER_ID = #{APPOINT_ONE_USER_ID}, - APPOINT_ONE_USER_NAME = #{APPOINT_ONE_USER_NAME} + zzName = #{zzName} where XGF_USER_DETAILS_ID = #{XGF_USER_DETAILS_ID} diff --git a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml index 78e7a597..9a021c38 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml @@ -22,7 +22,8 @@ f.OPERATOR_TIME, f.ISFLOW, f.STUDY_STATUS, - f.CHECK_STATUS + f.CHECK_STATUS, + f.CHECK_STEP @@ -40,7 +41,8 @@ OPERATOR_TIME, ISFLOW, STUDY_STATUS, - CHECK_STATUS + CHECK_STATUS, + CHECK_STEP @@ -58,7 +60,8 @@ #{OPERATOR_TIME}, #{ISFLOW}, #{STUDY_STATUS}, - #{CHECK_STATUS} + #{CHECK_STATUS}, + #{CHECK_STEP} @@ -99,7 +102,8 @@ OPERATOR_TIME = #{OPERATOR_TIME}, ISFLOW = #{ISFLOW}, STUDY_STATUS = #{STUDY_STATUS}, - CHECK_STATUS = #{CHECK_STATUS} + CHECK_STATUS = #{CHECK_STATUS}, + CHECK_STEP = #{CHECK_STEP} where XGF_USER_ID = #{XGF_USER_ID} @@ -321,15 +325,18 @@ a.BELONG_TO_CORP_NAME, a.USERNAME, a.NAME, - b.MANAGER_DEPARTMENT_ID, - b.MANAGER_DEPARTMENT_NAME, - b.MAIN_DEPARTMENT_ID, - b.MAIN_DEPARTMENT_NAME - from - xgf_user a - left join xgf_user_details b on a.XGF_USER_ID = b.XGF_USER_ID + c.* + from xgf_user a + left join xgf_flows c on a.XGF_USER_ID = c.FLOWS_ID where a.IS_DELETE = '0' - and (a.APPOINT_USER_ID = #{pd.USER_ID} or a.APPOINT_ONE_USER_ID is #{pd.USER_ID}) + and (c.APPOINT_ONE_USER_ID = #{pd.USER_ID} + or c.APPOINT_TWO_USER_ID = #{pd.USER_ID} + or c.APPOINT_THREE_USER_ID = #{pd.USER_ID} + or c.APPOINT_FOUR_USER_ID = #{pd.USER_ID} + or c.APPOINT_FIVE_USER_ID = #{pd.USER_ID} + or c.APPOINT_SIX_USER_ID = #{pd.USER_ID} + or c.APPOINT_SEVEN_USER_ID = #{pd.USER_ID} + ) and a.STATUS = #{pd.STATUS} @@ -339,6 +346,9 @@ and a.CHECK_STATUS = #{pd.CHECK_STATUS} + + and a.CHECK_STEP = #{pd.CHECK_STEP} + From 0bfd1d1d9dc4a6ab1a2aa6db64175be9fa786718 Mon Sep 17 00:00:00 2001 From: liujun Date: Fri, 19 Jan 2024 16:45:45 +0800 Subject: [PATCH 15/64] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/xgf/XgfUserController.java | 2 + .../zcloud/service/xgf/XgfUserService.java | 2 - .../service/xgf/impl/XgfUserServiceImpl.java | 108 +++++++++--------- 3 files changed, 53 insertions(+), 59 deletions(-) diff --git a/src/main/java/com/zcloud/controller/xgf/XgfUserController.java b/src/main/java/com/zcloud/controller/xgf/XgfUserController.java index f9ade76d..22d6d78d 100644 --- a/src/main/java/com/zcloud/controller/xgf/XgfUserController.java +++ b/src/main/java/com/zcloud/controller/xgf/XgfUserController.java @@ -6,6 +6,7 @@ import com.zcloud.entity.PageData; import com.zcloud.service.xgf.TrainingBatchService; import com.zcloud.service.xgf.XgfUserService; import com.zcloud.util.HttpClientService; +import com.zcloud.util.Jurisdiction; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -102,6 +103,7 @@ public class XgfUserController extends BaseController { @ResponseBody public Object getAppointApproveList(Page page) throws Exception{ PageData request = this.getPageData(); + request.put("USER_ID", Jurisdiction.getUSER_ID()); page.setPd(request); PageData response = new PageData(); response.put("result", "success"); diff --git a/src/main/java/com/zcloud/service/xgf/XgfUserService.java b/src/main/java/com/zcloud/service/xgf/XgfUserService.java index 2e947dfa..47ee65ad 100644 --- a/src/main/java/com/zcloud/service/xgf/XgfUserService.java +++ b/src/main/java/com/zcloud/service/xgf/XgfUserService.java @@ -26,6 +26,4 @@ public interface XgfUserService { List findRecordList(PageData condition) throws Exception; List getAppointApproveList(Page page); - - void approveAppoint(PageData request) throws Exception; } diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index 1684043a..b881982f 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -271,12 +271,17 @@ public class XgfUserServiceImpl implements XgfUserService { } // 通过则指定监管部门人员进行审核，不同过则打回相关方端(将CHECK_STATUS改为1) if ("1".equals(request.getString("STATUS"))) { - entity.put("STATUS", "1"); entity.put("VALID_FLAG", "1"); - entity.put("CHECK_STATUS", "1"); - entity.put("CHECK_STEP", 2); + if (StringUtils.isBlank(entity.getString("endFlag"))) { + entity.put("CHECK_STATUS", "1"); + } else { + entity.put("CHECK_STATUS", 2); + } + entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); } else { entity.put("STATUS", "0"); + entity.put("VALID_FLAG", "0"); + entity.put("CHECK_STATUS", "-2"); PageData key = new PageData(); key.putAll(entity); key.put("USER_ID", condition.get("XGF_USER_ID")); @@ -302,44 +307,11 @@ public class XgfUserServiceImpl implements XgfUserService { condition.put("APPOINT_DEPARTMENT_NAME", request.getString("APPOINT_DEPARTMENT_NAME")); condition.put("APPOINT_USER_ID", request.getString("APPOINT_USER_ID")); condition.put("APPOINT_USER_NAME", request.getString("APPOINT_USER_NAME")); - handle(condition, flows); - + // 保存审计进度 + this.handle(condition, flows); + // 保存审批记录 + this.saveLog(x, request.getString("STATUS"), "企业端初次审批"); xgfUserMapper.edit(entity); - /* 保存审批记录 */ - condition.clear(); - condition.put("FOREIGN_KEY", entity.getString("XGF_USER_ID")); - condition.put("TYPE", "1"); - condition.put("VALID_FLAG", "1"); - PageData flow = flowMapper.findByCondition(condition); - if (flow == null || flow.size() == 0) { - throw new RuntimeException("未找到该用户审批流程"); - } - condition.clear(); - condition.put("FLOW_ID", flow.getString("FLOW_ID")); - PageData currentNode = flowDetailMapper.selectOne(condition); - PageData nextNode = new PageData(); - nextNode.put("FLOW_DETAIL_ID", Warden.get32UUID()); - nextNode.put("FLOW_ID", flow.getString("FLOW_ID")); - nextNode.put("STEP_FLAG", "1"); - nextNode.put("STEP_NAME", "相关方数据将人员信息发送给企业端"); - nextNode.put("SORT", Integer.parseInt(currentNode.get("SORT").toString()) + 1); - nextNode.put("APPROVER_ID", Jurisdiction.getUSER_ID()); - nextNode.put("APPROVER_NAME", Jurisdiction.getName()); - nextNode.put("APPROVER_TIME", DateUtil.getTime()); - nextNode.put("APPROVER_CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - condition.clear(); - condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - PageData corpInfo = corpInfoMapper.findById(condition); - if (corpInfo != null && corpInfo.size() > 0) { - nextNode.put("APPROVER_CORPINFO_NAME", corpInfo.getString("NAME")); - } - nextNode.put("PASS_FLAG", request.getString("STATUS")); - nextNode.put("END_FLAG", "0"); - nextNode.put("ISDELETE", "0"); - nextNode.put("PARENT_ID", currentNode.getString("FLOW_DETAIL_ID")); - flowDetailMapper.save(nextNode); - currentNode.put("STEP_FLAG", "0"); - flowDetailMapper.edit(currentNode); } } @@ -362,23 +334,6 @@ public class XgfUserServiceImpl implements XgfUserService { return list; } - @Override - public void approveAppoint(PageData request) throws Exception { - PageData condition = new PageData(); - condition.put("XGF_USER_ID",request.getString("XGF_USER_ID")); - PageData userInfo = xgfUserMapper.findById(condition); - if (userInfo == null || userInfo.size() == 0) { - throw new RuntimeException("未找到该用户"); - } - condition.clear(); - condition.put("FLOWS_ID", userInfo.getString("XGF_USER_ID")); - PageData flows = xgfFlowsMapper.findById(condition); - if (flows == null || flows.size() == 0) { - throw new RuntimeException("未找到该用户详审批信息"); - } - handle(request,flows); - } - /* 获取当前用户是否有权限审批 */ private String getPower(PageData x) { switch (Integer.parseInt(x.get("CHECK_STEP").toString())) { @@ -510,4 +465,43 @@ public class XgfUserServiceImpl implements XgfUserService { break; } } + + void saveLog(String id,String status,String name){ + /* 保存审批记录 */ + PageData condition = new PageData(); + condition.clear(); + condition.put("FOREIGN_KEY", id); + condition.put("TYPE", "1"); + condition.put("VALID_FLAG", "1"); + PageData flow = flowMapper.findByCondition(condition); + if (flow == null || flow.size() == 0) { + throw new RuntimeException("流程已被暂停，请联系管理员"); + } + condition.clear(); + condition.put("FLOW_ID", flow.getString("FLOW_ID")); + PageData currentNode = flowDetailMapper.selectOne(condition); + PageData nextNode = new PageData(); + nextNode.put("FLOW_DETAIL_ID", Warden.get32UUID()); + nextNode.put("FLOW_ID", flow.getString("FLOW_ID")); + nextNode.put("STEP_FLAG", "1"); + nextNode.put("STEP_NAME", name); + nextNode.put("SORT", Integer.parseInt(currentNode.get("SORT").toString()) + 1); + nextNode.put("APPROVER_ID", Jurisdiction.getUSER_ID()); + nextNode.put("APPROVER_NAME", Jurisdiction.getName()); + nextNode.put("APPROVER_TIME", DateUtil.getTime()); + nextNode.put("APPROVER_CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + condition.clear(); + condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData corpInfo = corpInfoMapper.findById(condition); + if (corpInfo != null && corpInfo.size() > 0) { + nextNode.put("APPROVER_CORPINFO_NAME", corpInfo.getString("NAME")); + } + nextNode.put("PASS_FLAG", status); + nextNode.put("END_FLAG", "0"); + nextNode.put("ISDELETE", "0"); + nextNode.put("PARENT_ID", currentNode.getString("FLOW_DETAIL_ID")); + flowDetailMapper.save(nextNode); + currentNode.put("STEP_FLAG", "0"); + flowDetailMapper.edit(currentNode); + } } From a88e165a08ef22ce97e2dcd80c42eedc1c22b105 Mon Sep 17 00:00:00 2001 From: guoyuepeng <770272267@qq.com> Date: Fri, 19 Jan 2024 17:45:39 +0800 Subject: [PATCH 16/64] =?UTF-8?q?2024=E5=B9=B41=E6=9C=8819=E6=97=A5V01.00.?= =?UTF-8?q?51?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bus/ClassMessageController.java | 74 +++++++++ .../mapper/dsno2/bus/ClassInfoMapper.java | 34 +++++ .../zcloud/service/bus/ClassInfoService.java | 27 ++++ .../bus/impl/ClassInfoServiceImpl.java | 43 ++++++ .../util/HiddenExcelImgToSessionView.java | 4 +- .../com/zcloud/util/HiddenExcelImgView.java | 4 +- src/main/resources/application-dev.properties | 7 +- .../resources/application-local.properties | 1 + .../resources/application-master.properties | 6 +- src/main/resources/application.properties | 4 +- .../mybatis/dsno2/bus/ClassInfoMapper.xml | 143 ++++++++++++++++++ 11 files changed, 337 insertions(+), 10 deletions(-) create mode 100644 src/main/java/com/zcloud/controller/bus/ClassMessageController.java create mode 100644 src/main/java/com/zcloud/mapper/dsno2/bus/ClassInfoMapper.java create mode 100644 src/main/java/com/zcloud/service/bus/ClassInfoService.java create mode 100644 src/main/java/com/zcloud/service/bus/impl/ClassInfoServiceImpl.java create mode 100644 src/main/resources/mybatis/dsno2/bus/ClassInfoMapper.xml diff --git a/src/main/java/com/zcloud/controller/bus/ClassMessageController.java b/src/main/java/com/zcloud/controller/bus/ClassMessageController.java new file mode 100644 index 00000000..d65f9341 --- /dev/null +++ b/src/main/java/com/zcloud/controller/bus/ClassMessageController.java @@ -0,0 +1,74 @@ +package com.zcloud.controller.bus; + +import com.alibaba.fastjson.JSONObject; +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.bus.ClassInfoService; +import com.zcloud.util.HttpClientService; +import com.zcloud.util.Tools; +import com.zcloud.util.Warden; +import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 说明：开课信息 + * 作者：luoxiaobao + * 时间：2023-09-27 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/classMessage") +public class ClassMessageController extends BaseController { + + @Value("${preventionxgf.api.url}") + private String xgfUrl; + + private static int index = -1; + + + @Autowired + private ClassInfoService classInfoService; + + + @RequestMapping(value = "/getUserinfoList") + @ResponseBody + public Object getUserinfoList() throws Exception { + Map map = new HashMap<>(); + PageData condition = new PageData(); + PageData request = this.getPageData(); + condition.put("CLASS_MESSAGE_ID", request.getString("CLASS_MESSAGE_ID")); + condition.put("CLASS_INFO_ID", request.getString("CLASS_INFO_ID")); + condition.put("CER_TYPE", "7498057c4c1f4a11b9a960e66ea04a7a"); + List list = classInfoService.findinfoByCondition(condition); + map.put("list", list); + map.put("result", "success"); + return map; + } + + @RequestMapping(value = "/getClassinfo") + @ResponseBody + public Object getClassinfo() throws Exception { + Map map = new HashMap<>(); + PageData condition = new PageData(); + PageData request = this.getPageData(); + condition.put("TRAINUSERS_ID", request.getString("TRAINUSERS_ID")); + PageData entity = classInfoService.getClassinfo(condition); + map.put("pd", entity); + map.put("result", "success"); + return map; + } +} diff --git a/src/main/java/com/zcloud/mapper/dsno2/bus/ClassInfoMapper.java b/src/main/java/com/zcloud/mapper/dsno2/bus/ClassInfoMapper.java new file mode 100644 index 00000000..3cbca053 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/dsno2/bus/ClassInfoMapper.java @@ -0,0 +1,34 @@ +package com.zcloud.mapper.dsno2.bus; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：班级学员表 + * 作者：luoxiaobao + * 时间：2023-09-27 + * 官网：www.zcloudchina.com + */ +public interface ClassInfoMapper { + + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + + PageData getClassinfo(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + + + List findinfoByCondition(PageData pd); + + +} + diff --git a/src/main/java/com/zcloud/service/bus/ClassInfoService.java b/src/main/java/com/zcloud/service/bus/ClassInfoService.java new file mode 100644 index 00000000..0ee34beb --- /dev/null +++ b/src/main/java/com/zcloud/service/bus/ClassInfoService.java @@ -0,0 +1,27 @@ +package com.zcloud.service.bus; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：班级学员表 + * 作者：luoxiaobao + * 时间：2023-09-27 + * 官网：www.zcloudchina.com + */ +public interface ClassInfoService { + + + + public PageData getClassinfo(PageData pd)throws Exception; + + + List findinfoByCondition(PageData condition) throws Exception; + + + + +} + diff --git a/src/main/java/com/zcloud/service/bus/impl/ClassInfoServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/ClassInfoServiceImpl.java new file mode 100644 index 00000000..91b8e35c --- /dev/null +++ b/src/main/java/com/zcloud/service/bus/impl/ClassInfoServiceImpl.java @@ -0,0 +1,43 @@ +package com.zcloud.service.bus.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.dsno2.bus.ClassInfoMapper; +import com.zcloud.service.bus.ClassInfoService; +import com.zcloud.util.Warden; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 说明：班级学员表 + * 作者：luoxiaobao + * 时间：2023-09-27 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class ClassInfoServiceImpl implements ClassInfoService { + + @Autowired + private ClassInfoMapper classInfoMapper; + + + + + public PageData getClassinfo(PageData pd)throws Exception{ + return classInfoMapper.getClassinfo(pd); + } + + + @Override + public List findinfoByCondition(PageData condition) throws Exception { + return classInfoMapper.findinfoByCondition(condition); + } + + + +} + diff --git a/src/main/java/com/zcloud/util/HiddenExcelImgToSessionView.java b/src/main/java/com/zcloud/util/HiddenExcelImgToSessionView.java index 52306ff6..15b510fd 100644 --- a/src/main/java/com/zcloud/util/HiddenExcelImgToSessionView.java +++ b/src/main/java/com/zcloud/util/HiddenExcelImgToSessionView.java @@ -34,9 +34,7 @@ import net.coobird.thumbnailator.Thumbnails; @Component public class HiddenExcelImgToSessionView extends AbstractXlsView{ - @Value("${http.file.url}") - private String fileUrl; - + private String fileUrl = "http://192.168.192.201:8991/file/"; @Override protected void buildExcelDocument(Map model, Workbook workbook, HttpServletRequest request, diff --git a/src/main/java/com/zcloud/util/HiddenExcelImgView.java b/src/main/java/com/zcloud/util/HiddenExcelImgView.java index a447a4bf..8b788f4b 100644 --- a/src/main/java/com/zcloud/util/HiddenExcelImgView.java +++ b/src/main/java/com/zcloud/util/HiddenExcelImgView.java @@ -38,8 +38,8 @@ import com.zcloud.entity.PageData; */ public class HiddenExcelImgView extends AbstractXlsView{ - @Value("${http.file.url}") - private String fileUrl; + + private String fileUrl = "http://192.168.192.201:8991/file/"; @Override protected void buildExcelDocument(Map model, diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index a4dd85c3..1db9c3fa 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -75,7 +75,7 @@ rocketmq.consumer.group2=edu-admin-edit rocketmq.consumer.group1=edu-admin-add #rocketmq.name-server=10.0.140.141:9876 #rocketmq.name-server=192.168.0.70:9876 -rocketmq.name-server=192.168.0.31:9876 +rocketmq.name-server=172.24.151.16:9876 rocketmq.producer.group=libmiddle rocketmq.producer.send-message-timeout=3000 rocketmq.producer.compress-message-body-threshold=4096 @@ -90,6 +90,8 @@ mq.topic.eightWork=eightWork mq.group.info=scheduled_tasks mq.group.eightWork=scheduled_tasks_eightWork +http.file.url=https://qgqy.qhdsafety.com/file/ + #数据同步topic mq.gwj.data.topic=czks_qy_docking @@ -98,3 +100,6 @@ mq.gwj.file.topic=czks_qy_dockingPicture baseimgpath=https://qgqy.qhdsafety.com/file/ cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd + +corp.default.pic-path=https://qgqy.qhdsafety.com/ +corp.default.back-end-path=https://qgqy.qhdsafety.com/file/ diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties index 483396e2..023e9b32 100644 --- a/src/main/resources/application-local.properties +++ b/src/main/resources/application-local.properties @@ -91,6 +91,7 @@ mq.group.eightWork=scheduled_tasks_eightWork corp.default.pic-path=https://qgqy.qhdsafety.com/ + corp.default.back-end-path=https://qgqy.qhdsafety.com/file/ http.file.url=https://qgqy.qhdsafety.com/file/ diff --git a/src/main/resources/application-master.properties b/src/main/resources/application-master.properties index 4ebd818f..bc29f57c 100644 --- a/src/main/resources/application-master.properties +++ b/src/main/resources/application-master.properties @@ -85,12 +85,14 @@ mq.group.info=scheduled_tasks mq.group.eightWork=scheduled_tasks_eightWork -corp.default.pic-path=https://qgqy.qhdsafety.com/file/ +corp.default.pic-path=http://192.168.192.201:8991/file/ corp.default.back-end-path=https://skqhdg.porthebei.com:9004/file/ #数据同步topic mq.gwj.data.topic=czks_docking mq.gwj.file.topic=czks_dockingPicture #港务局文件服务器前缀 -baseimgpath=https://qgqy.qhdsafety.com/file/ +baseimgpath=http://192.168.192.201:8991/file/ cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd + +http.file.url=http://192.168.192.201:8991/file/ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 25c549c5..dd259ac5 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -4,9 +4,9 @@ server.port=8091 #?? #spring.profiles.active=local #����31ʱʹ�� -spring.profiles.active=dev +#spring.profiles.active=dev #?? -#spring.profiles.active=master +spring.profiles.active=master diff --git a/src/main/resources/mybatis/dsno2/bus/ClassInfoMapper.xml b/src/main/resources/mybatis/dsno2/bus/ClassInfoMapper.xml new file mode 100644 index 00000000..8a25c2a4 --- /dev/null +++ b/src/main/resources/mybatis/dsno2/bus/ClassInfoMapper.xml @@ -0,0 +1,143 @@ + + + + + + + BUS_CLASS_INFO + + + + + SYS_DICTIONARIES + + + + + f.CREATE_TIME, + f.CREATOR, + f.OPERATE_TIME, + f.OPERATOR, + f.ISDELETE, + f.CORPINFO_ID, + f.USER_ID, + f.STATUS, + f.CLASS_MESSAGE_ID, + f.CLASS_INFO_ID, + f.USERNAME, + f.NAME, + f.SEX, + f.CARD_ID, + f.RELEVANT_UNIT_NAME, + f.DEPARTMENT_NAME, + f.PHOTO, + f.PHONE, + f.PERSON_WORK_TYPE, + f.CERTIFICATE, + f.CLASS_NO, + f.TRAINUSERS_ID + + + + + CREATE_TIME, + CREATOR, + OPERATE_TIME, + OPERATOR, + ISDELETE, + CORPINFO_ID, + USER_ID, + STATUS, + CLASS_MESSAGE_ID, + CLASS_INFO_ID, + USERNAME, + NAME, + SEX, + CARD_ID, + RELEVANT_UNIT_NAME, + DEPARTMENT_NAME, + PHOTO, + PHONE, + PERSON_WORK_TYPE, + CERTIFICATE, + CLASS_NO, + TRAINUSERS_ID + + + + + #{CREATE_TIME}, + #{CREATOR}, + #{OPERATE_TIME}, + #{OPERATOR}, + #{ISDELETE}, + #{CORPINFO_ID}, + #{USER_ID}, + #{STATUS}, + #{CLASS_MESSAGE_ID}, + #{CLASS_INFO_ID}, + #{USERNAME}, + #{NAME}, + #{SEX}, + #{CARD_ID}, + #{RELEVANT_UNIT_NAME}, + #{DEPARTMENT_NAME}, + #{PHOTO}, + #{PHONE}, + #{PERSON_WORK_TYPE}, + #{CERTIFICATE}, + #{CLASS_NO}, + #{TRAINUSERS_ID} + + + + + + + + + + + From 7d015ec13839e7ce083cd2792650edbcbb124e0b Mon Sep 17 00:00:00 2001 From: liujun Date: Fri, 19 Jan 2024 18:35:26 +0800 Subject: [PATCH 17/64] =?UTF-8?q?=E8=8B=A5=E5=B9=B2bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/xgf/impl/XgfUserServiceImpl.java | 56 ++++++++++--------- .../datasource/xgf/FlowDetailMapper.xml | 16 ++++-- .../mybatis/datasource/xgf/FlowMapper.xml | 10 +++- .../mybatis/datasource/xgf/XgfFlowsMapper.xml | 4 +- .../mybatis/datasource/xgf/XgfUserMapper.xml | 4 +- 5 files changed, 52 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index b881982f..ba0b55c6 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -78,7 +78,7 @@ public class XgfUserServiceImpl implements XgfUserService { x.put("VALID_FLAG", "1"); x.put("STATUS", "1"); x.put("CHECK_STATUS", "0"); - x.put("CHECK_STEP", 1); + x.put("CHECK_STEP", 0); x.put("CREATED_TIME", DateUtil.getTime()); x.put("OPERATOR_TIME", DateUtil.getTime()); x.put("IS_DELETE", "0"); @@ -126,7 +126,7 @@ public class XgfUserServiceImpl implements XgfUserService { x.put("VALID_FLAG", "1"); x.put("STATUS", "1"); x.put("CHECK_STATUS", "0"); - x.put("CHECK_STEP", 1); + x.put("CHECK_STEP", 0); if ("2".equals(x.getString("STUDY_STATUS"))) { x.put("STUDY_STATUS", "2"); } else { @@ -144,34 +144,25 @@ public class XgfUserServiceImpl implements XgfUserService { if (flows == null || flows.size() <= 0) { flows = new PageData(); flows.put("FLOWS_ID", x.getString("USER_ID")); - flows.put("FLOWS_STEP", 1); + flows.put("FLOWS_STEP", 0); flows.put("FOREIGN_KEY_ID", x.getString("USER_ID")); flows.put("FOREIGN_KEY_NAME", "xgf_user=>XGF_USER_ID"); - flows.put("APPOINT_ZERO_CORP_ID", x.getString("CORPINFO_ID")); - condition.clear(); - condition.put("CORPINFO_ID", x.getString("CORPINFO_ID")); - PageData corpInfo = corpInfoMapper.findById(condition); - if (corpInfo != null && corpInfo.size() > 0) { - flows.put("APPOINT_ZERO_CORP_NAME", corpInfo.getString("NAME")); - } - flows.put("APPOINT_ZERO_DEPARTMENT_ID", x.getString("APPOINT_ZERO_DEPARTMENT_ID")); - flows.put("APPOINT_ZERO_DEPARTMENT_NAME", x.getString("APPOINT_ZERO_DEPARTMENT_NAME")); - flows.put("APPOINT_ZERO_USER_ID", x.getString("APPOINT_ZERO_USER_ID")); - flows.put("APPOINT_ZERO_USER_NAME", x.getString("APPOINT_ZERO_USER_NAME")); + flows.put("IS_DELETE", "0"); + flows.put("APPOINT_ZERO_CORP_ID", x.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_ZERO_CORP_NAME", x.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_ZERO_DEPARTMENT_ID", x.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_ZERO_DEPARTMENT_NAME", x.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_ZERO_USER_ID", x.getString("APPOINT_USER_ID")); + flows.put("APPOINT_ZERO_USER_NAME", x.getString("APPOINT_USER_NAME")); xgfFlowsMapper.save(flows); } else { - flows.put("APPOINT_ZERO_CORP_ID", x.getString("CORPINFO_ID")); - flows.put("FLOWS_STEP", 1); - condition.clear(); - condition.put("CORPINFO_ID", x.getString("CORPINFO_ID")); - PageData corpInfo = corpInfoMapper.findById(condition); - if (corpInfo != null && corpInfo.size() > 0) { - flows.put("APPOINT_ZERO_CORP_NAME", corpInfo.getString("NAME")); - } - flows.put("APPOINT_ZERO_DEPARTMENT_ID", x.getString("APPOINT_ZERO_DEPARTMENT_ID")); - flows.put("APPOINT_ZERO_DEPARTMENT_NAME", x.getString("APPOINT_ZERO_DEPARTMENT_NAME")); - flows.put("APPOINT_ZERO_USER_ID", x.getString("APPOINT_ZERO_USER_ID")); - flows.put("APPOINT_ZERO_USER_NAME", x.getString("APPOINT_ZERO_USER_NAME")); + flows.put("FLOWS_STEP", 0); + flows.put("APPOINT_ZERO_CORP_NAME", x.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_ZERO_CORP_ID", x.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_ZERO_DEPARTMENT_ID", x.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_ZERO_DEPARTMENT_NAME", x.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_ZERO_USER_ID", x.getString("APPOINT_USER_ID")); + flows.put("APPOINT_ZERO_USER_NAME", x.getString("APPOINT_USER_NAME")); xgfFlowsMapper.edit(flows); } /* 3、流程记录 */ @@ -372,6 +363,19 @@ public class XgfUserServiceImpl implements XgfUserService { void handle(PageData info, PageData flows) throws Exception{ switch (Integer.parseInt(flows.get("FLOWS_STEP").toString())) { + case 0: + flows.put("APPOINT_ZERO_CORP_ID", info.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_ZERO_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_ZERO_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_ZERO_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_ZERO_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_ZERO_USER_NAME", info.getString("APPOINT_USER_NAME")); + flows.put("APPOINT_ZERO_TIME", DateUtil.getTime()); + flows.put("APPOINT_ZERO_STATUS", info.getString("STATUS")); + flows.put("APPOINT_ZERO_OPINION", info.getString("OPINION")); + flows.put("FLOWS_STEP", 1); + xgfFlowsMapper.edit(flows); + break; case 1: flows.put("APPOINT_ONE_CORP_ID", info.getString("APPOINT_CORP_ID")); flows.put("APPOINT_ONE_CORP_NAME", info.getString("APPOINT_CORP_NAME")); diff --git a/src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml b/src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml index 4a663f1e..238c3b06 100644 --- a/src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml @@ -28,7 +28,8 @@ f.END_FLAG, f.ISDELETE, f.PARENT_ID, - f.FOREIGN_KEY + f.FOREIGN_KEY, + f.SORT @@ -47,7 +48,8 @@ END_FLAG, ISDELETE, PARENT_ID, - FOREIGN_KEY + FOREIGN_KEY, + SORT @@ -66,7 +68,8 @@ #{END_FLAG}, #{ISDELETE}, #{PARENT_ID}, - #{FOREIGN_KEY} + #{FOREIGN_KEY}, + #{SORT} @@ -104,8 +107,9 @@ END_FLAG = #{END_FLAG}, ISDELETE = #{ISDELETE}, PARENT_ID = #{PARENT_ID}, - FOREIGN_ID = #{FOREIGN_ID}, + FOREIGN_KEY = #{FOREIGN_KEY}, STEP_NAME = #{STEP_NAME}, + SORT = #{SORT} where FLOW_DETAIL_ID = #{FLOW_DETAIL_ID} @@ -125,8 +129,8 @@ and a.PARENT_ID = #{PARENT_ID} - - and a.FOREIGN_ID = #{FOREIGN_ID} + + and a.FOREIGN_KEY = #{FOREIGN_KEY} diff --git a/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml b/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml index 94da1851..c0ab1b4e 100644 --- a/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml @@ -20,7 +20,8 @@ f.CREATOR_NAME, f.CREATOR_TIME, f.VALID_FLAG, - f.FOREIGN_KEY + f.FOREIGN_KEY, + f.ISDELETE @@ -31,7 +32,8 @@ CREATOR_NAME, CREATOR_TIME, VALID_FLAG, - FOREIGN_KEY + FOREIGN_KEY, + ISDELETE @@ -42,7 +44,8 @@ #{CREATOR_NAME}, #{CREATOR_TIME}, #{VALID_FLAG}, - #{FOREIGN_KEY} + #{FOREIGN_KEY}, + #{ISDELETE} @@ -74,6 +77,7 @@ CREATOR_NAME = #{CREATOR_NAME}, CREATOR_TIME = #{CREATOR_TIME}, VALID_FLAG = #{VALID_FLAG}, + ISDELETE = #{ISDELETE}, FOREIGN_KEY = FOREIGN_KEY where FLOW_ID = #{FLOW_ID} diff --git a/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml index a9f52371..ff7f5e4a 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml @@ -1,6 +1,6 @@ - + xgf_flows @@ -320,7 +320,7 @@ APPOINT_SEVEN_USER_NAME = #{APPOINT_SEVEN_USER_NAME}, APPOINT_SEVEN_STATUS = #{APPOINT_SEVEN_STATUS}, APPOINT_SEVEN_OPINION = #{APPOINT_SEVEN_OPINION} - where a.FLOWS_ID = #{FLOWS_ID} + where FLOWS_ID = #{FLOWS_ID} diff --git a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml index 9a021c38..fd91dc5a 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml @@ -325,11 +325,13 @@ a.BELONG_TO_CORP_NAME, a.USERNAME, a.NAME, + a.CHECK_STEP, c.* from xgf_user a left join xgf_flows c on a.XGF_USER_ID = c.FLOWS_ID where a.IS_DELETE = '0' - and (c.APPOINT_ONE_USER_ID = #{pd.USER_ID} + and (c.APPOINT_ZERO_USER_ID = #{pd.USER_ID} + or c.APPOINT_ONE_USER_ID = #{pd.USER_ID} or c.APPOINT_TWO_USER_ID = #{pd.USER_ID} or c.APPOINT_THREE_USER_ID = #{pd.USER_ID} or c.APPOINT_FOUR_USER_ID = #{pd.USER_ID} From d3b41ecf7bc77feef520f1521611f188f50cfc7d Mon Sep 17 00:00:00 2001 From: liujun Date: Fri, 19 Jan 2024 20:44:33 +0800 Subject: [PATCH 18/64] =?UTF-8?q?=E5=8E=BB=E9=99=A4debugger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/xgf/impl/XgfUserServiceImpl.java | 336 ++++++++++++------ .../mybatis/datasource/xgf/XgfFlowsMapper.xml | 46 ++- 2 files changed, 264 insertions(+), 118 deletions(-) diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index ba0b55c6..4c71a1c7 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -4,7 +4,6 @@ import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.bus.CorpInfoMapper; import com.zcloud.mapper.datasource.xgf.*; -import com.zcloud.service.bus.CorpInfoService; import com.zcloud.service.system.DepartmentService; import com.zcloud.service.xgf.XgfUserService; import com.zcloud.util.*; @@ -77,7 +76,7 @@ public class XgfUserServiceImpl implements XgfUserService { x.put("XGF_USER_NAME", x.get("NAME")); x.put("VALID_FLAG", "1"); x.put("STATUS", "1"); - x.put("CHECK_STATUS", "0"); + x.put("CHECK_STATUS", "1"); x.put("CHECK_STEP", 0); x.put("CREATED_TIME", DateUtil.getTime()); x.put("OPERATOR_TIME", DateUtil.getTime()); @@ -125,7 +124,7 @@ public class XgfUserServiceImpl implements XgfUserService { x.put("IS_DELETE", "0"); x.put("VALID_FLAG", "1"); x.put("STATUS", "1"); - x.put("CHECK_STATUS", "0"); + x.put("CHECK_STATUS", "1"); x.put("CHECK_STEP", 0); if ("2".equals(x.getString("STUDY_STATUS"))) { x.put("STUDY_STATUS", "2"); @@ -256,33 +255,6 @@ public class XgfUserServiceImpl implements XgfUserService { PageData condition = new PageData(); for (String x : list) { condition.put("XGF_USER_ID", x); - PageData entity = xgfUserMapper.findById(condition); - if (entity == null || entity.size() == 0) { - throw new RuntimeException("未找到该用户"); - } - // 通过则指定监管部门人员进行审核，不同过则打回相关方端(将CHECK_STATUS改为1) - if ("1".equals(request.getString("STATUS"))) { - entity.put("VALID_FLAG", "1"); - if (StringUtils.isBlank(entity.getString("endFlag"))) { - entity.put("CHECK_STATUS", "1"); - } else { - entity.put("CHECK_STATUS", 2); - } - entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); - } else { - entity.put("STATUS", "0"); - entity.put("VALID_FLAG", "0"); - entity.put("CHECK_STATUS", "-2"); - PageData key = new PageData(); - key.putAll(entity); - key.put("USER_ID", condition.get("XGF_USER_ID")); - key.put("STATUS", request.getString("STATUS")); - Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); - if (result == null || !"succeed".equals(result.get("result"))) { - throw new RuntimeException("请求失败"); - } - - } /* 保存审批信息 */ condition.clear(); condition.put("FLOWS_ID", x); @@ -298,11 +270,9 @@ public class XgfUserServiceImpl implements XgfUserService { condition.put("APPOINT_DEPARTMENT_NAME", request.getString("APPOINT_DEPARTMENT_NAME")); condition.put("APPOINT_USER_ID", request.getString("APPOINT_USER_ID")); condition.put("APPOINT_USER_NAME", request.getString("APPOINT_USER_NAME")); - // 保存审计进度 - this.handle(condition, flows); + // 保存审批记录 - this.saveLog(x, request.getString("STATUS"), "企业端初次审批"); - xgfUserMapper.edit(entity); + this.saveLog(x, request.getString("STATUS"), this.handle(condition, flows)); } } @@ -361,11 +331,13 @@ public class XgfUserServiceImpl implements XgfUserService { } } - void handle(PageData info, PageData flows) throws Exception{ + private String handle(PageData info, PageData flows) throws Exception { + PageData condition = new PageData(); switch (Integer.parseInt(flows.get("FLOWS_STEP").toString())) { - case 0: + case 0:// 相关方端推送数据至企业端 flows.put("APPOINT_ZERO_CORP_ID", info.getString("APPOINT_CORP_ID")); flows.put("APPOINT_ZERO_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_ZERO_CORP_TYPE", "0"); flows.put("APPOINT_ZERO_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); flows.put("APPOINT_ZERO_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); flows.put("APPOINT_ZERO_USER_ID", info.getString("APPOINT_USER_ID")); @@ -375,73 +347,215 @@ public class XgfUserServiceImpl implements XgfUserService { flows.put("APPOINT_ZERO_OPINION", info.getString("OPINION")); flows.put("FLOWS_STEP", 1); xgfFlowsMapper.edit(flows); - break; - case 1: - flows.put("APPOINT_ONE_CORP_ID", info.getString("APPOINT_CORP_ID")); - flows.put("APPOINT_ONE_CORP_NAME", info.getString("APPOINT_CORP_NAME")); - flows.put("APPOINT_ONE_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); - flows.put("APPOINT_ONE_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); - flows.put("APPOINT_ONE_USER_ID", info.getString("APPOINT_USER_ID")); - flows.put("APPOINT_ONE_USER_NAME", info.getString("APPOINT_USER_NAME")); - flows.put("APPOINT_ONE_TIME", DateUtil.getTime()); - flows.put("APPOINT_ONE_STATUS", info.getString("STATUS")); - flows.put("APPOINT_ONE_OPINION", info.getString("OPINION")); - flows.put("FLOWS_STEP", 2); - xgfFlowsMapper.edit(flows); - break; - case 2: - flows.put("APPOINT_TWO_CORP_ID", info.getString("APPOINT_CORP_ID")); - flows.put("APPOINT_TWO_CORP_NAME", info.getString("APPOINT_CORP_NAME")); - flows.put("APPOINT_TWO_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); - flows.put("APPOINT_TWO_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); - flows.put("APPOINT_TWO_USER_ID", info.getString("APPOINT_USER_ID")); - flows.put("APPOINT_TWO_USER_NAME", info.getString("APPOINT_USER_NAME")); - flows.put("APPOINT_TWO_TIME", DateUtil.getTime()); - flows.put("APPOINT_TWO_STATUS", info.getString("STATUS")); - flows.put("APPOINT_TWO_OPINION", info.getString("OPINION")); - flows.put("FLOWS_STEP", 3); - xgfFlowsMapper.edit(flows); - break; - case 3: - flows.put("APPOINT_THREE_CORP_ID", info.getString("APPOINT_CORP_ID")); - flows.put("APPOINT_THREE_CORP_NAME", info.getString("APPOINT_CORP_NAME")); - flows.put("APPOINT_THREE_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); - flows.put("APPOINT_THREE_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); - flows.put("APPOINT_THREE_USER_ID", info.getString("APPOINT_USER_ID")); - flows.put("APPOINT_THREE_USER_NAME", info.getString("APPOINT_USER_NAME")); - flows.put("APPOINT_THREE_TIME", DateUtil.getTime()); - flows.put("APPOINT_THREE_STATUS", info.getString("STATUS")); - flows.put("APPOINT_THREE_OPINION", info.getString("OPINION")); - flows.put("FLOWS_STEP", 4); - xgfFlowsMapper.edit(flows); - break; - case 4: - flows.put("APPOINT_FOUR_CORP_ID", info.getString("APPOINT_CORP_ID")); - flows.put("APPOINT_FOUR_CORP_NAME", info.getString("APPOINT_CORP_NAME")); - flows.put("APPOINT_FOUR_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); - flows.put("APPOINT_FOUR_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); - flows.put("APPOINT_FOUR_USER_ID", info.getString("APPOINT_USER_ID")); - flows.put("APPOINT_FOUR_USER_NAME", info.getString("APPOINT_USER_NAME")); - flows.put("APPOINT_FOUR_TIME", DateUtil.getTime()); - flows.put("APPOINT_FOUR_STATUS", info.getString("STATUS")); - flows.put("APPOINT_FOUR_OPINION", info.getString("OPINION")); - flows.put("FLOWS_STEP", 5); - xgfFlowsMapper.edit(flows); - break; - case 5: - flows.put("APPOINT_FIVE_CORP_ID", info.getString("APPOINT_CORP_ID")); - flows.put("APPOINT_FIVE_CORP_NAME", info.getString("APPOINT_CORP_NAME")); - flows.put("APPOINT_FIVE_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); - flows.put("APPOINT_FIVE_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); - flows.put("APPOINT_FIVE_USER_ID", info.getString("APPOINT_USER_ID")); - flows.put("APPOINT_FIVE_USER_NAME", info.getString("APPOINT_USER_NAME")); - flows.put("APPOINT_FIVE_TIME", DateUtil.getTime()); - flows.put("APPOINT_FIVE_STATUS", info.getString("STATUS")); - flows.put("APPOINT_FIVE_OPINION", info.getString("OPINION")); - flows.put("FLOWS_STEP", 6); - xgfFlowsMapper.edit(flows); - break; - case 6: + return "0"; + // 相关方选择的审批人审批，并指定下一位监管部门审批人，不过打回相关方端 + case 1: { + condition.clear(); + condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); + PageData entity = xgfUserMapper.findById(condition); + if ("0".equals(info.getString("STATUS"))) { + entity.put("STATUS", "0"); + entity.put("VALID_FLAG", "0"); + entity.put("CHECK_STATUS", "-2"); + PageData key = new PageData(); + key.putAll(entity); + key.put("USER_ID", condition.get("XGF_USER_ID")); + key.put("STATUS", info.getString("STATUS")); + Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); + if (result == null || !"succeed".equals(result.get("result"))) { + throw new RuntimeException("请求失败"); + } + xgfUserMapper.edit(entity); + return "0"; + } else { + condition.clear(); + flows.put("APPOINT_ONE_CORP_ID", Jurisdiction.getCORPINFO_ID()); + condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData corpInfo = corpInfoMapper.findById(condition); + if (corpInfo != null && corpInfo.size() > 0) { + flows.put("APPOINT_ONE_CORP_NAME", corpInfo.getString("CORP_NAME")); + } + flows.put("APPOINT_ONE_CORP_TYPE", "0"); + flows.put("APPOINT_ONE_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_ONE_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_ONE_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_ONE_USER_NAME", info.getString("APPOINT_USER_NAME")); + flows.put("APPOINT_ONE_TIME", DateUtil.getTime()); + flows.put("APPOINT_ONE_STATUS", info.getString("STATUS")); + flows.put("APPOINT_ONE_OPINION", info.getString("OPINION")); + flows.put("FLOWS_STEP", 2); + xgfFlowsMapper.edit(flows); + return "0"; + } + } + //监管部门审批人审批，并根据不同类型的审批规则进行处理 + case 2: { + condition.clear(); + condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); + PageData entity = xgfUserMapper.findById(condition); + // 1、判断是否通过审核 + if ("0".equals(info.getString("STATUS"))) { + entity.put("STATUS", "0"); + entity.put("VALID_FLAG", "0"); + entity.put("CHECK_STATUS", "-2"); + PageData key = new PageData(); + key.putAll(entity); + key.put("USER_ID", condition.get("XGF_USER_ID")); + key.put("STATUS", info.getString("STATUS")); + Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); + if (result == null || !"succeed".equals(result.get("result"))) { + throw new RuntimeException("请求失败"); + } + return "0"; + } else { + // 2、通过审核后，根据不同的流程进行不同的处理 + switch (info.getString("FLOWS_TYPE")) { + case "0":// 辖区单位审批 + entity.put("CHECK_STATUS", 2); + entity.put("VALID_FLAG", "1"); + entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + xgfUserMapper.edit(entity); + return "1"; + case "1":// 集团单位审批，需要指定下一位人员进行审批 + entity.put("CHECK_STATUS", 1); + entity.put("VALID_FLAG", "2"); + entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + xgfUserMapper.edit(entity); + + flows.put("APPOINT_TWO_CORP_ID", info.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_TWO_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_TWO_CORP_TYPE", "0"); + flows.put("APPOINT_TWO_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_TWO_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_TWO_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_TWO_USER_NAME", info.getString("APPOINT_USER_NAME")); + flows.put("APPOINT_TWO_TIME", DateUtil.getTime()); + flows.put("APPOINT_TWO_STATUS", info.getString("STATUS")); + flows.put("APPOINT_TWO_OPINION", info.getString("OPINION")); + flows.put("FLOWS_STEP", 3); + xgfFlowsMapper.edit(flows); + return "0"; + default: + throw new RuntimeException("未知的审批类型"); + } + } + } + case 3: { + condition.clear(); + condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); + PageData entity = xgfUserMapper.findById(condition); + // 1、判断是否通过审核 + if ("0".equals(info.getString("STATUS"))) { + entity.put("STATUS", "0"); + entity.put("VALID_FLAG", "0"); + entity.put("CHECK_STATUS", "-2"); + PageData key = new PageData(); + key.putAll(entity); + key.put("USER_ID", condition.get("XGF_USER_ID")); + key.put("STATUS", info.getString("STATUS")); + Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); + if (result == null || !"succeed".equals(result.get("result"))) { + throw new RuntimeException("请求失败"); + } + return "0"; + } else { + // TODO 根据是否委托辖区单位进行处理(前端传回来) + switch (info.getString("attorneyFlag")) { + case "0":// 由股份端审批 + entity.put("CHECK_STATUS", 2); + entity.put("VALID_FLAG", "1"); + entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + xgfUserMapper.edit(entity); + return "1"; + case "1":// 辖区单位审批，需要指定审批人 + entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + xgfUserMapper.edit(entity); + + flows.put("APPOINT_THREE_CORP_ID", info.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_THREE_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_THREE_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_THREE_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_THREE_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_THREE_USER_NAME", info.getString("APPOINT_USER_NAME")); + flows.put("APPOINT_THREE_TIME", DateUtil.getTime()); + flows.put("APPOINT_THREE_STATUS", info.getString("STATUS")); + flows.put("APPOINT_THREE_OPINION", info.getString("OPINION")); + flows.put("FLOWS_STEP", 4); + xgfFlowsMapper.edit(flows); + return "0"; + default: + throw new RuntimeException("未知的审批类型"); + } + + } + } + // 委托先去单位审批 + case 4: { + condition.clear(); + condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); + PageData entity = xgfUserMapper.findById(condition); + // 1、判断是否通过审核 + if ("0".equals(info.getString("STATUS"))) { + entity.put("STATUS", "0"); + entity.put("VALID_FLAG", "0"); + entity.put("CHECK_STATUS", "-2"); + PageData key = new PageData(); + key.putAll(entity); + key.put("USER_ID", condition.get("XGF_USER_ID")); + key.put("STATUS", info.getString("STATUS")); + Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); + if (result == null || !"succeed".equals(result.get("result"))) { + throw new RuntimeException("请求失败"); + } + return "0"; + } else { + entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + xgfUserMapper.edit(entity); + + flows.put("APPOINT_FOUR_CORP_ID", info.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_FOUR_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_FOUR_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_FOUR_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_FOUR_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_FOUR_USER_NAME", info.getString("APPOINT_USER_NAME")); + flows.put("APPOINT_FOUR_TIME", DateUtil.getTime()); + flows.put("APPOINT_FOUR_STATUS", info.getString("STATUS")); + flows.put("APPOINT_FOUR_OPINION", info.getString("OPINION")); + flows.put("FLOWS_STEP", 5); + xgfFlowsMapper.edit(flows); + return "0"; + } + + } + // 委托辖区单位监管部门审批 + case 5: { + condition.clear(); + condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); + PageData entity = xgfUserMapper.findById(condition); + // 1、判断是否通过审核 + if ("0".equals(info.getString("STATUS"))) { + entity.put("STATUS", "0"); + entity.put("VALID_FLAG", "0"); + entity.put("CHECK_STATUS", "-2"); + PageData key = new PageData(); + key.putAll(entity); + key.put("USER_ID", condition.get("XGF_USER_ID")); + key.put("STATUS", info.getString("STATUS")); + Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); + if (result == null || !"succeed".equals(result.get("result"))) { + throw new RuntimeException("请求失败"); + } + return "0"; + } else { + entity.put("CHECK_STATUS", 2); + entity.put("VALID_FLAG", "1"); + entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + xgfUserMapper.edit(entity); + return "1"; + } + } + // 6往后是备用流程 + case 6: { flows.put("APPOINT_SIX_CORP_ID", info.getString("APPOINT_CORP_ID")); flows.put("APPOINT_SIX_CORP_NAME", info.getString("APPOINT_CORP_NAME")); flows.put("APPOINT_SIX_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); @@ -453,8 +567,9 @@ public class XgfUserServiceImpl implements XgfUserService { flows.put("APPOINT_SIX_OPINION", info.getString("OPINION")); flows.put("FLOWS_STEP", 7); xgfFlowsMapper.edit(flows); - break; - case 7: + return "0"; + } + case 7: { flows.put("APPOINT_SEVEN_CORP_ID", info.getString("APPOINT_CORP_ID")); flows.put("APPOINT_SEVEN_CORP_NAME", info.getString("APPOINT_CORP_NAME")); flows.put("APPOINT_SEVEN_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); @@ -466,11 +581,14 @@ public class XgfUserServiceImpl implements XgfUserService { flows.put("APPOINT_SEVEN_OPINION", info.getString("OPINION")); flows.put("FLOWS_STEP", 8); xgfFlowsMapper.edit(flows); - break; + return "0"; + } + default: + return "1"; } } - void saveLog(String id,String status,String name){ + void saveLog(String id, String status, String endFlag) throws Exception { /* 保存审批记录 */ PageData condition = new PageData(); condition.clear(); @@ -488,7 +606,7 @@ public class XgfUserServiceImpl implements XgfUserService { nextNode.put("FLOW_DETAIL_ID", Warden.get32UUID()); nextNode.put("FLOW_ID", flow.getString("FLOW_ID")); nextNode.put("STEP_FLAG", "1"); - nextNode.put("STEP_NAME", name); + nextNode.put("STEP_NAME", "企业端审批"); nextNode.put("SORT", Integer.parseInt(currentNode.get("SORT").toString()) + 1); nextNode.put("APPROVER_ID", Jurisdiction.getUSER_ID()); nextNode.put("APPROVER_NAME", Jurisdiction.getName()); @@ -501,7 +619,7 @@ public class XgfUserServiceImpl implements XgfUserService { nextNode.put("APPROVER_CORPINFO_NAME", corpInfo.getString("NAME")); } nextNode.put("PASS_FLAG", status); - nextNode.put("END_FLAG", "0"); + nextNode.put("END_FLAG", endFlag); nextNode.put("ISDELETE", "0"); nextNode.put("PARENT_ID", currentNode.getString("FLOW_DETAIL_ID")); flowDetailMapper.save(nextNode); diff --git a/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml index ff7f5e4a..1a29cad2 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml @@ -1,6 +1,6 @@ - + xgf_flows @@ -11,9 +11,10 @@ f.FOREIGN_KEY_ID, f.FOREIGN_KEY_NAME, f.FLOWS_STEP, + f.FLOWS_TYPE, f.IS_DELETE, f.APPOINT_ZERO_CORP_ID, - f.APPOINT_ZERO_CORP_TYEP, + f.APPOINT_ZERO_CORP_TYPE, f.APPOINT_ZERO_CORP_NAME, f.APPOINT_ZERO_DEPARTMENT_ID, f.APPOINT_ZERO_DEPARTMENT_NAME, @@ -24,7 +25,7 @@ f.APPOINT_ZERO_TIME, f.APPOINT_ONE_CORP_ID, f.APPOINT_ONE_CORP_NAME, - f.APPOINT_ONE_CORP_TYEP, + f.APPOINT_ONE_CORP_TYPE, f.APPOINT_ONE_DEPARTMENT_ID, f.APPOINT_ONE_DEPARTMENT_NAME, f.APPOINT_ONE_USER_ID, @@ -34,6 +35,7 @@ f.APPOINT_ONE_TIME, f.APPOINT_TWO_CORP_ID, f.APPOINT_TWO_CORP_NAME, + f.APPOINT_TWO_CORP_TYPE, f.APPOINT_TWO_DEPARTMENT_ID, f.APPOINT_TWO_DEPARTMENT_NAME, f.APPOINT_TWO_USER_ID, @@ -41,6 +43,7 @@ f.APPOINT_TWO_TIME, f.APPOINT_THREE_CORP_ID, f.APPOINT_THREE_CORP_NAME, + f.APPOINT_THREE_CORP_TYPE, f.APPOINT_THREE_DEPARTMENT_ID, f.APPOINT_THREE_DEPARTMENT_NAME, f.APPOINT_THREE_USER_ID, @@ -50,6 +53,7 @@ f.APPOINT_THREE_TIME, f.APPOINT_FOUR_CORP_ID, f.APPOINT_FOUR_CORP_NAME, + f.APPOINT_FOUR_CORP_TYPE, f.APPOINT_FOUR_DEPARTMENT_ID, f.APPOINT_FOUR_DEPARTMENT_NAME, f.APPOINT_FOUR_USER_ID, @@ -58,6 +62,7 @@ f.APPOINT_FOUR_OPINION, f.APPOINT_FIVE_CORP_ID, f.APPOINT_FIVE_CORP_NAME, + f.APPOINT_FIVE_CORP_TYPE, f.APPOINT_FIVE_DEPARTMENT_ID, f.APPOINT_FIVE_DEPARTMENT_NAME, f.APPOINT_FIVE_USER_ID, @@ -66,6 +71,7 @@ f.APPOINT_FIVE_OPINION, f.APPOINT_SIX_CORP_ID, f.APPOINT_SIX_CORP_NAME, + f.APPOINT_SIX_CORP_TYPE, f.APPOINT_SIX_DEPARTMENT_ID, f.APPOINT_SIX_DEPARTMENT_NAME, f.APPOINT_SIX_USER_ID, @@ -74,6 +80,7 @@ f.APPOINT_SIX_OPINION, f.APPOINT_SEVEN_CORP_ID, f.APPOINT_SEVEN_CORP_NAME, + f.APPOINT_SEVEN_CORP_TYPE, f.APPOINT_SEVEN_DEPARTMENT_ID, f.APPOINT_SEVEN_DEPARTMENT_NAME, f.APPOINT_SEVEN_USER_ID, @@ -87,9 +94,10 @@ FOREIGN_KEY_ID, FOREIGN_KEY_NAME, FLOWS_STEP, + FLOWS_TYPE, IS_DELETE, APPOINT_ZERO_CORP_ID, - APPOINT_ZERO_CORP_TYEP, + APPOINT_ZERO_CORP_TYPE, APPOINT_ZERO_CORP_NAME, APPOINT_ZERO_DEPARTMENT_ID, APPOINT_ZERO_DEPARTMENT_NAME, @@ -100,7 +108,7 @@ APPOINT_ZERO_TIME, APPOINT_ONE_CORP_ID, APPOINT_ONE_CORP_NAME, - APPOINT_ONE_CORP_TYEP, + APPOINT_ONE_CORP_TYPE, APPOINT_ONE_DEPARTMENT_ID, APPOINT_ONE_DEPARTMENT_NAME, APPOINT_ONE_USER_ID, @@ -110,6 +118,7 @@ APPOINT_ONE_TIME, APPOINT_TWO_CORP_ID, APPOINT_TWO_CORP_NAME, + APPOINT_TWO_CORP_TYPE, APPOINT_TWO_DEPARTMENT_ID, APPOINT_TWO_DEPARTMENT_NAME, APPOINT_TWO_USER_ID, @@ -117,6 +126,7 @@ APPOINT_TWO_TIME, APPOINT_THREE_CORP_ID, APPOINT_THREE_CORP_NAME, + APPOINT_THREE_CORP_TYPE, APPOINT_THREE_DEPARTMENT_ID, APPOINT_THREE_DEPARTMENT_NAME, APPOINT_THREE_USER_ID, @@ -126,6 +136,7 @@ APPOINT_THREE_TIME, APPOINT_FOUR_CORP_ID, APPOINT_FOUR_CORP_NAME, + APPOINT_FOUR_CORP_TYPE, APPOINT_FOUR_DEPARTMENT_ID, APPOINT_FOUR_DEPARTMENT_NAME, APPOINT_FOUR_USER_ID, @@ -134,6 +145,7 @@ APPOINT_FOUR_OPINION, APPOINT_FIVE_CORP_ID, APPOINT_FIVE_CORP_NAME, + APPOINT_FIVE_CORP_TYPE, APPOINT_FIVE_DEPARTMENT_ID, APPOINT_FIVE_DEPARTMENT_NAME, APPOINT_FIVE_USER_ID, @@ -142,6 +154,7 @@ APPOINT_FIVE_OPINION, APPOINT_SIX_CORP_ID, APPOINT_SIX_CORP_NAME, + APPOINT_SIX_CORP_TYPE, APPOINT_SIX_DEPARTMENT_ID, APPOINT_SIX_DEPARTMENT_NAME, APPOINT_SIX_USER_ID, @@ -150,6 +163,7 @@ APPOINT_SIX_OPINION, APPOINT_SEVEN_CORP_ID, APPOINT_SEVEN_CORP_NAME, + APPOINT_SEVEN_CORP_TYPE, APPOINT_SEVEN_DEPARTMENT_ID, APPOINT_SEVEN_DEPARTMENT_NAME, APPOINT_SEVEN_USER_ID, @@ -163,9 +177,10 @@ #{FOREIGN_KEY_ID}, #{FOREIGN_KEY_NAME}, #{FLOWS_STEP}, + #{FLOWS_TYPE}, #{IS_DELETE}, #{APPOINT_ZERO_CORP_ID}, - #{APPOINT_ZERO_CORP_TYEP}, + #{APPOINT_ZERO_CORP_TYPE}, #{APPOINT_ZERO_CORP_NAME}, #{APPOINT_ZERO_DEPARTMENT_ID}, #{APPOINT_ZERO_DEPARTMENT_NAME}, @@ -176,7 +191,7 @@ #{APPOINT_ZERO_TIME}, #{APPOINT_ONE_CORP_ID}, #{APPOINT_ONE_CORP_NAME}, - #{APPOINT_ONE_CORP_TYEP}, + #{APPOINT_ONE_CORP_TYPE}, #{APPOINT_ONE_DEPARTMENT_ID}, #{APPOINT_ONE_DEPARTMENT_NAME}, #{APPOINT_ONE_USER_ID}, @@ -186,6 +201,7 @@ #{APPOINT_ONE_TIME}, #{APPOINT_TWO_CORP_ID}, #{APPOINT_TWO_CORP_NAME}, + #{APPOINT_TWO_CORP_TYPE}, #{APPOINT_TWO_DEPARTMENT_ID}, #{APPOINT_TWO_DEPARTMENT_NAME}, #{APPOINT_TWO_USER_ID}, @@ -193,6 +209,7 @@ #{APPOINT_TWO_TIME}, #{APPOINT_THREE_CORP_ID}, #{APPOINT_THREE_CORP_NAME}, + #{APPOINT_THREE_CORP_TYPE}, #{APPOINT_THREE_DEPARTMENT_ID}, #{APPOINT_THREE_DEPARTMENT_NAME}, #{APPOINT_THREE_USER_ID}, @@ -202,6 +219,7 @@ #{APPOINT_THREE_TIME}, #{APPOINT_FOUR_CORP_ID}, #{APPOINT_FOUR_CORP_NAME}, + #{APPOINT_FOUR_CORP_TYPE}, #{APPOINT_FOUR_DEPARTMENT_ID}, #{APPOINT_FOUR_DEPARTMENT_NAME}, #{APPOINT_FOUR_USER_ID}, @@ -210,6 +228,7 @@ #{APPOINT_FOUR_OPINION}, #{APPOINT_FIVE_CORP_ID}, #{APPOINT_FIVE_CORP_NAME}, + #{APPOINT_FIVE_CORP_TYPE}, #{APPOINT_FIVE_DEPARTMENT_ID}, #{APPOINT_FIVE_DEPARTMENT_NAME}, #{APPOINT_FIVE_USER_ID}, @@ -218,6 +237,7 @@ #{APPOINT_FIVE_OPINION}, #{APPOINT_SIX_CORP_ID}, #{APPOINT_SIX_CORP_NAME}, + #{APPOINT_SIX_CORP_TYPE}, #{APPOINT_SIX_DEPARTMENT_ID}, #{APPOINT_SIX_DEPARTMENT_NAME}, #{APPOINT_SIX_USER_ID}, @@ -226,6 +246,7 @@ #{APPOINT_SIX_OPINION}, #{APPOINT_SEVEN_CORP_ID}, #{APPOINT_SEVEN_CORP_NAME}, + #{APPOINT_SEVEN_CORP_TYPE}, #{APPOINT_SEVEN_DEPARTMENT_ID}, #{APPOINT_SEVEN_DEPARTMENT_NAME}, #{APPOINT_SEVEN_USER_ID}, @@ -251,9 +272,10 @@ FOREIGN_KEY_ID = #{FOREIGN_KEY_ID}, FOREIGN_KEY_NAME = #{FOREIGN_KEY_NAME}, FLOWS_STEP = #{FLOWS_STEP}, + FLOWS_TYPE = #{FLOWS_TYPE}, IS_DELETE = #{IS_DELETE}, APPOINT_ZERO_CORP_ID = #{APPOINT_ZERO_CORP_ID}, - APPOINT_ZERO_CORP_TYEP = #{APPOINT_ZERO_CORP_TYEP}, + APPOINT_ZERO_CORP_TYPE = #{APPOINT_ZERO_CORP_TYPE}, APPOINT_ZERO_CORP_NAME = #{APPOINT_ZERO_CORP_NAME}, APPOINT_ZERO_DEPARTMENT_ID = #{APPOINT_ZERO_DEPARTMENT_ID}, APPOINT_ZERO_DEPARTMENT_NAME = #{APPOINT_ZERO_DEPARTMENT_NAME}, @@ -264,7 +286,7 @@ APPOINT_ZERO_TIME = #{APPOINT_ZERO_TIME}, APPOINT_ONE_CORP_ID = #{APPOINT_ONE_CORP_ID}, APPOINT_ONE_CORP_NAME = #{APPOINT_ONE_CORP_NAME}, - APPOINT_ONE_CORP_TYEP = #{APPOINT_ONE_CORP_TYEP}, + APPOINT_ONE_CORP_TYPE = #{APPOINT_ONE_CORP_TYPE}, APPOINT_ONE_DEPARTMENT_ID = #{APPOINT_ONE_DEPARTMENT_ID}, APPOINT_ONE_DEPARTMENT_NAME = #{APPOINT_ONE_DEPARTMENT_NAME}, APPOINT_ONE_USER_ID = #{APPOINT_ONE_USER_ID}, @@ -274,6 +296,7 @@ APPOINT_ONE_TIME = #{APPOINT_ONE_TIME}, APPOINT_TWO_CORP_ID = #{APPOINT_TWO_CORP_ID}, APPOINT_TWO_CORP_NAME = #{APPOINT_TWO_CORP_NAME}, + APPOINT_TWO_CORP_TYPE = #{APPOINT_TWO_CORP_TYPE}, APPOINT_TWO_DEPARTMENT_ID = #{APPOINT_TWO_DEPARTMENT_ID}, APPOINT_TWO_DEPARTMENT_NAME = #{APPOINT_TWO_DEPARTMENT_NAME}, APPOINT_TWO_USER_ID = #{APPOINT_TWO_USER_ID}, @@ -281,6 +304,7 @@ APPOINT_TWO_TIME = #{APPOINT_TWO_TIME}, APPOINT_THREE_CORP_ID = #{APPOINT_THREE_CORP_ID}, APPOINT_THREE_CORP_NAME = #{APPOINT_THREE_CORP_NAME}, + APPOINT_THREE_CORP_TYPE = #{APPOINT_THREE_CORP_TYPE}, APPOINT_THREE_DEPARTMENT_ID = #{APPOINT_THREE_DEPARTMENT_ID}, APPOINT_THREE_DEPARTMENT_NAME = #{APPOINT_THREE_DEPARTMENT_NAME}, APPOINT_THREE_USER_ID = #{APPOINT_THREE_USER_ID}, @@ -290,6 +314,7 @@ APPOINT_THREE_TIME = #{APPOINT_THREE_TIME}, APPOINT_FOUR_CORP_ID = #{APPOINT_FOUR_CORP_ID}, APPOINT_FOUR_CORP_NAME = #{APPOINT_FOUR_CORP_NAME}, + APPOINT_FOUR_CORP_TYPE = #{APPOINT_FOUR_CORP_TYPE}, APPOINT_FOUR_DEPARTMENT_ID = #{APPOINT_FOUR_DEPARTMENT_ID}, APPOINT_FOUR_DEPARTMENT_NAME = #{APPOINT_FOUR_DEPARTMENT_NAME}, APPOINT_FOUR_USER_ID = #{APPOINT_FOUR_USER_ID}, @@ -298,6 +323,7 @@ APPOINT_FOUR_OPINION = #{APPOINT_FOUR_OPINION}, APPOINT_FIVE_CORP_ID = #{APPOINT_FIVE_CORP_ID}, APPOINT_FIVE_CORP_NAME = #{APPOINT_FIVE_CORP_NAME}, + APPOINT_FIVE_CORP_TYPE = #{APPOINT_FIVE_CORP_TYPE}, APPOINT_FIVE_DEPARTMENT_ID = #{APPOINT_FIVE_DEPARTMENT_ID}, APPOINT_FIVE_DEPARTMENT_NAME = #{APPOINT_FIVE_DEPARTMENT_NAME}, APPOINT_FIVE_USER_ID = #{APPOINT_FIVE_USER_ID}, @@ -306,6 +332,7 @@ APPOINT_FIVE_OPINION = #{APPOINT_FIVE_OPINION}, APPOINT_SIX_CORP_ID = #{APPOINT_SIX_CORP_ID}, APPOINT_SIX_CORP_NAME = #{APPOINT_SIX_CORP_NAME}, + APPOINT_SIX_CORP_TYPE = #{APPOINT_SIX_CORP_TYPE}, APPOINT_SIX_DEPARTMENT_ID = #{APPOINT_SIX_DEPARTMENT_ID}, APPOINT_SIX_DEPARTMENT_NAME = #{APPOINT_SIX_DEPARTMENT_NAME}, APPOINT_SIX_USER_ID = #{APPOINT_SIX_USER_ID}, @@ -314,6 +341,7 @@ APPOINT_SIX_OPINION = #{APPOINT_SIX_OPINION}, APPOINT_SEVEN_CORP_ID = #{APPOINT_SEVEN_CORP_ID}, APPOINT_SEVEN_CORP_NAME = #{APPOINT_SEVEN_CORP_NAME}, + APPOINT_SEVEN_CORP_TYPE = #{APPOINT_SEVEN_CORP_TYPE}, APPOINT_SEVEN_DEPARTMENT_ID = #{APPOINT_SEVEN_DEPARTMENT_ID}, APPOINT_SEVEN_DEPARTMENT_NAME = #{APPOINT_SEVEN_DEPARTMENT_NAME}, APPOINT_SEVEN_USER_ID = #{APPOINT_SEVEN_USER_ID}, From 332f52244c96c5960b8ffb145e7cf96fcaa10f94 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Sun, 21 Jan 2024 17:37:50 +0800 Subject: [PATCH 19/64] =?UTF-8?q?=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/mkmj/MkmjGateLogController.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zcloud/controller/mkmj/MkmjGateLogController.java b/src/main/java/com/zcloud/controller/mkmj/MkmjGateLogController.java index 9fa7455d..56a7736f 100644 --- a/src/main/java/com/zcloud/controller/mkmj/MkmjGateLogController.java +++ b/src/main/java/com/zcloud/controller/mkmj/MkmjGateLogController.java @@ -27,7 +27,7 @@ import java.util.Map; * 官网：www.zcloudchina.com */ @Controller -@RequestMapping("/mkmjAreaGate") +@RequestMapping("/mkmjGateLog") public class MkmjGateLogController extends BaseController { @Autowired @@ -38,7 +38,7 @@ public class MkmjGateLogController extends BaseController { * @throws Exception */ @RequestMapping(value="/add") - @RequiresPermissions("mkmjAreaGate:add") + @RequiresPermissions("mkmjGateLog:add") @ResponseBody public ReturnMap add() throws Exception{ PageData pd = new PageData(); @@ -56,7 +56,7 @@ public class MkmjGateLogController extends BaseController { * @throws Exception */ @RequestMapping(value="/delete") - @RequiresPermissions("mkmjAreaGate:del") + @RequiresPermissions("mkmjGateLog:del") @ResponseBody public ReturnMap delete() throws Exception{ PageData pd = new PageData(); @@ -69,7 +69,7 @@ public class MkmjGateLogController extends BaseController { * @throws Exception */ @RequestMapping(value="/edit") - @RequiresPermissions("mkmjAreaGate:edit") + @RequiresPermissions("mkmjGateLog:edit") @ResponseBody public ReturnMap edit() throws Exception{ PageData pd = new PageData(); @@ -84,7 +84,7 @@ public class MkmjGateLogController extends BaseController { * @throws Exception */ @RequestMapping(value="/list") - @RequiresPermissions("mkmjAreaGate:list") + @RequiresPermissions("mkmjGateLog:list") @ResponseBody public Object list(Page page) throws Exception{ Map map = new HashMap(); @@ -106,7 +106,7 @@ public class MkmjGateLogController extends BaseController { * @throws Exception */ @RequestMapping(value="/goEdit") - @RequiresPermissions("mkmjAreaGate:edit") + @RequiresPermissions("mkmjGateLog:edit") @ResponseBody public Object goEdit() throws Exception{ Map map = new HashMap(); From eebf95ff9eebdff2f03a8d58e48a6296030b947d Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 22 Jan 2024 14:39:39 +0800 Subject: [PATCH 20/64] =?UTF-8?q?=E8=8B=A5=E5=B9=B2bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/xgf/impl/XgfUserServiceImpl.java | 92 ++++++++++++++----- .../mybatis/datasource/xgf/XgfFlowsMapper.xml | 2 +- 2 files changed, 68 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index 4c71a1c7..3e974f5d 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -136,17 +136,20 @@ public class XgfUserServiceImpl implements XgfUserService { xgfUserMapper.edit(x); xgfUserDetailsMapper.edit(x); } + /* 2、保存相关方人员流程审批信息 */ condition.clear(); condition.put("FLOWS_ID", x.getString("USER_ID")); PageData flows = xgfFlowsMapper.findById(condition); if (flows == null || flows.size() <= 0) { flows = new PageData(); + flows.put("FLOWS_TYPE", getType(x.getString("CORPINOF_ID"))); flows.put("FLOWS_ID", x.getString("USER_ID")); flows.put("FLOWS_STEP", 0); flows.put("FOREIGN_KEY_ID", x.getString("USER_ID")); flows.put("FOREIGN_KEY_NAME", "xgf_user=>XGF_USER_ID"); flows.put("IS_DELETE", "0"); + flows.put("APPOINT_ZERO_CORP_TYPE", "0"); flows.put("APPOINT_ZERO_CORP_ID", x.getString("APPOINT_CORP_ID")); flows.put("APPOINT_ZERO_CORP_NAME", x.getString("APPOINT_CORP_NAME")); flows.put("APPOINT_ZERO_DEPARTMENT_ID", x.getString("APPOINT_DEPARTMENT_ID")); @@ -156,8 +159,10 @@ public class XgfUserServiceImpl implements XgfUserService { xgfFlowsMapper.save(flows); } else { flows.put("FLOWS_STEP", 0); + flows.put("FLOWS_TYPE", getType(x.getString("CORPINOF_ID"))); flows.put("APPOINT_ZERO_CORP_NAME", x.getString("APPOINT_CORP_NAME")); flows.put("APPOINT_ZERO_CORP_ID", x.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_ZERO_CORP_TYPE", "0"); flows.put("APPOINT_ZERO_DEPARTMENT_ID", x.getString("APPOINT_DEPARTMENT_ID")); flows.put("APPOINT_ZERO_DEPARTMENT_NAME", x.getString("APPOINT_DEPARTMENT_NAME")); flows.put("APPOINT_ZERO_USER_ID", x.getString("APPOINT_USER_ID")); @@ -264,6 +269,7 @@ public class XgfUserServiceImpl implements XgfUserService { } condition.clear(); condition.put("STATUS", request.getString("STATUS")); + condition.put("OPINION", request.getString("OPINION")); condition.put("APPOINT_CORP_ID", request.getString("APPOINT_CORP_ID")); condition.put("APPOINT_CORP_NAME", request.getString("APPOINT_CORP_NAME")); condition.put("APPOINT_DEPARTMENT_ID", request.getString("APPOINT_DEPARTMENT_ID")); @@ -298,6 +304,10 @@ public class XgfUserServiceImpl implements XgfUserService { /* 获取当前用户是否有权限审批 */ private String getPower(PageData x) { switch (Integer.parseInt(x.get("CHECK_STEP").toString())) { + case 0: + if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_ZERO_USER_ID"))) { + return "1"; + } case 1: if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_ONE_USER_ID"))) { return "1"; @@ -335,18 +345,23 @@ public class XgfUserServiceImpl implements XgfUserService { PageData condition = new PageData(); switch (Integer.parseInt(flows.get("FLOWS_STEP").toString())) { case 0:// 相关方端推送数据至企业端 - flows.put("APPOINT_ZERO_CORP_ID", info.getString("APPOINT_CORP_ID")); - flows.put("APPOINT_ZERO_CORP_NAME", info.getString("APPOINT_CORP_NAME")); - flows.put("APPOINT_ZERO_CORP_TYPE", "0"); - flows.put("APPOINT_ZERO_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); - flows.put("APPOINT_ZERO_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); - flows.put("APPOINT_ZERO_USER_ID", info.getString("APPOINT_USER_ID")); - flows.put("APPOINT_ZERO_USER_NAME", info.getString("APPOINT_USER_NAME")); flows.put("APPOINT_ZERO_TIME", DateUtil.getTime()); flows.put("APPOINT_ZERO_STATUS", info.getString("STATUS")); flows.put("APPOINT_ZERO_OPINION", info.getString("OPINION")); + + flows.put("APPOINT_ONE_CORP_TYPE", "0"); + flows.put("APPOINT_ONE_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_ONE_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_ONE_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_ONE_USER_NAME", info.getString("APPOINT_USER_NAME")); + flows.put("APPOINT_ONE_CORP_ID", flows.getString("APPOINT_ZERO_CORP_ID")); + flows.put("APPOINT_ONE_CORP_NAME", flows.getString("APPOINT_ZERO_CORP_NAME")); flows.put("FLOWS_STEP", 1); xgfFlowsMapper.edit(flows); + condition.clear(); + condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); + PageData user = xgfUserMapper.findById(condition); + user.put("CHECK_STEP", 1); return "0"; // 相关方选择的审批人审批，并指定下一位监管部门审批人，不过打回相关方端 case 1: { @@ -368,24 +383,39 @@ public class XgfUserServiceImpl implements XgfUserService { xgfUserMapper.edit(entity); return "0"; } else { - condition.clear(); - flows.put("APPOINT_ONE_CORP_ID", Jurisdiction.getCORPINFO_ID()); - condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - PageData corpInfo = corpInfoMapper.findById(condition); - if (corpInfo != null && corpInfo.size() > 0) { - flows.put("APPOINT_ONE_CORP_NAME", corpInfo.getString("CORP_NAME")); + if ("1".equals(info.getString("FLOWS_TYPE"))) { + entity.put("CHECK_STATUS", 1); + entity.put("VALID_FLAG", "2"); + entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + xgfUserMapper.edit(entity); + + flows.put("APPOINT_TWO_CORP_TYPE", "0"); + flows.put("APPOINT_TWO_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_TWO_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_TWO_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_TWO_USER_NAME", info.getString("APPOINT_USER_NAME")); + flows.put("FLOWS_STEP", 2); + + flows.put("APPOINT_ONE_TIME", DateUtil.getTime()); + flows.put("APPOINT_ONE_STATUS", info.getString("STATUS")); + flows.put("APPOINT_ONE_OPINION", info.getString("OPINION")); + + xgfFlowsMapper.edit(flows); + return "0"; + } else { + entity.put("CHECK_STATUS", 2); + entity.put("VALID_FLAG", "1"); + entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + xgfUserMapper.edit(entity); + + flows.put("APPOINT_ONE_TIME", DateUtil.getTime()); + flows.put("APPOINT_ONE_STATUS", info.getString("STATUS")); + flows.put("APPOINT_ONE_OPINION", info.getString("OPINION")); + flows.put("FLOWS_STEP", 2); + + xgfFlowsMapper.edit(flows); + return "1"; } - flows.put("APPOINT_ONE_CORP_TYPE", "0"); - flows.put("APPOINT_ONE_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); - flows.put("APPOINT_ONE_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); - flows.put("APPOINT_ONE_USER_ID", info.getString("APPOINT_USER_ID")); - flows.put("APPOINT_ONE_USER_NAME", info.getString("APPOINT_USER_NAME")); - flows.put("APPOINT_ONE_TIME", DateUtil.getTime()); - flows.put("APPOINT_ONE_STATUS", info.getString("STATUS")); - flows.put("APPOINT_ONE_OPINION", info.getString("OPINION")); - flows.put("FLOWS_STEP", 2); - xgfFlowsMapper.edit(flows); - return "0"; } } //监管部门审批人审批，并根据不同类型的审批规则进行处理 @@ -588,7 +618,7 @@ public class XgfUserServiceImpl implements XgfUserService { } } - void saveLog(String id, String status, String endFlag) throws Exception { + private void saveLog(String id, String status, String endFlag) throws Exception { /* 保存审批记录 */ PageData condition = new PageData(); condition.clear(); @@ -601,6 +631,7 @@ public class XgfUserServiceImpl implements XgfUserService { } condition.clear(); condition.put("FLOW_ID", flow.getString("FLOW_ID")); + condition.put("STEP_FLAG", "1"); PageData currentNode = flowDetailMapper.selectOne(condition); PageData nextNode = new PageData(); nextNode.put("FLOW_DETAIL_ID", Warden.get32UUID()); @@ -626,4 +657,15 @@ public class XgfUserServiceImpl implements XgfUserService { currentNode.put("STEP_FLAG", "0"); flowDetailMapper.edit(currentNode); } + + private String getType(String corpInfoId) { + // 集团单位id（河港机械 jtdw002 1e6dbbe16004402f8d2c0e52afd9a676），（河港港工 jtdw003 3a854eefa7894e06aaa1a2611bca80f6），（河港检测 jtdw004 020578a4c1f04bc692ee25145c2efbe5），（方宇物业 jtdw005 90966974de3c4b83aca6f8fd6432d5c2） +// String jituandanwei = "1e6dbbe16004402f8d2c0e52afd9a676，3a854eefa7894e06aaa1a2611bca80f6，020578a4c1f04bc692ee25145c2efbe5，90966974de3c4b83aca6f8fd6432d5c2"; +// if (jituandanwei.contains(corpInfoId)) { +// return "1"; +// }else { +// return "0"; +// } + return "0"; + } } diff --git a/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml index 1a29cad2..1270676c 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml @@ -1,6 +1,6 @@ - + xgf_flows From e673955258cdf676caa675b1c5fecb1f3a588b55 Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 22 Jan 2024 15:23:03 +0800 Subject: [PATCH 21/64] =?UTF-8?q?=E8=8B=A5=E5=B9=B2bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/xgf/impl/XgfUserServiceImpl.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index 3e974f5d..ee248e60 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -362,6 +362,7 @@ public class XgfUserServiceImpl implements XgfUserService { condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData user = xgfUserMapper.findById(condition); user.put("CHECK_STEP", 1); + xgfUserMapper.edit(user); return "0"; // 相关方选择的审批人审批，并指定下一位监管部门审批人，不过打回相关方端 case 1: { @@ -659,13 +660,16 @@ public class XgfUserServiceImpl implements XgfUserService { } private String getType(String corpInfoId) { - // 集团单位id（河港机械 jtdw002 1e6dbbe16004402f8d2c0e52afd9a676），（河港港工 jtdw003 3a854eefa7894e06aaa1a2611bca80f6），（河港检测 jtdw004 020578a4c1f04bc692ee25145c2efbe5），（方宇物业 jtdw005 90966974de3c4b83aca6f8fd6432d5c2） -// String jituandanwei = "1e6dbbe16004402f8d2c0e52afd9a676，3a854eefa7894e06aaa1a2611bca80f6，020578a4c1f04bc692ee25145c2efbe5，90966974de3c4b83aca6f8fd6432d5c2"; -// if (jituandanwei.contains(corpInfoId)) { -// return "1"; -// }else { -// return "0"; -// } - return "0"; + // 集团单位id + // （河港机械 jtdw002 1e6dbbe16004402f8d2c0e52afd9a676）， + // （河港港工 jtdw003 3a854eefa7894e06aaa1a2611bca80f6）， + // （河港检测 jtdw004 020578a4c1f04bc692ee25145c2efbe5）， + // （方宇物业 jtdw005 90966974de3c4b83aca6f8fd6432d5c2） + String jituandanwei = "1e6dbbe16004402f8d2c0e52afd9a676，3a854eefa7894e06aaa1a2611bca80f6，020578a4c1f04bc692ee25145c2efbe5，90966974de3c4b83aca6f8fd6432d5c2"; + if (jituandanwei.contains(corpInfoId)) { + return "1"; + }else { + return "0"; + } } } From f7dd131d82403aef3eb815f2c9c86a62670e8073 Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 22 Jan 2024 18:11:55 +0800 Subject: [PATCH 22/64] =?UTF-8?q?=E8=8B=A5=E5=B9=B2bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index ee248e60..54c5ad9c 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -384,7 +384,7 @@ public class XgfUserServiceImpl implements XgfUserService { xgfUserMapper.edit(entity); return "0"; } else { - if ("1".equals(info.getString("FLOWS_TYPE"))) { + if ("1".equals(flows.getString("FLOWS_TYPE"))) { entity.put("CHECK_STATUS", 1); entity.put("VALID_FLAG", "2"); entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); @@ -440,7 +440,7 @@ public class XgfUserServiceImpl implements XgfUserService { return "0"; } else { // 2、通过审核后，根据不同的流程进行不同的处理 - switch (info.getString("FLOWS_TYPE")) { + switch (flows.getString("FLOWS_TYPE")) { case "0":// 辖区单位审批 entity.put("CHECK_STATUS", 2); entity.put("VALID_FLAG", "1"); From bacf047b67a364457e76401b8d29a0bdbda27710 Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 22 Jan 2024 18:21:41 +0800 Subject: [PATCH 23/64] =?UTF-8?q?=E8=8B=A5=E5=B9=B2bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/xgf/impl/XgfUserServiceImpl.java | 52 +++++++++++-------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index 54c5ad9c..b629a65a 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -502,16 +502,17 @@ public class XgfUserServiceImpl implements XgfUserService { entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); xgfUserMapper.edit(entity); - flows.put("APPOINT_THREE_CORP_ID", info.getString("APPOINT_CORP_ID")); - flows.put("APPOINT_THREE_CORP_NAME", info.getString("APPOINT_CORP_NAME")); - flows.put("APPOINT_THREE_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); - flows.put("APPOINT_THREE_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); - flows.put("APPOINT_THREE_USER_ID", info.getString("APPOINT_USER_ID")); - flows.put("APPOINT_THREE_USER_NAME", info.getString("APPOINT_USER_NAME")); + flows.put("APPOINT_FOUR_CORP_ID", info.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_FOUR_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_FOUR_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_FOUR_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_FOUR_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_FOUR_USER_NAME", info.getString("APPOINT_USER_NAME")); + flows.put("FLOWS_STEP", 4); + flows.put("APPOINT_THREE_TIME", DateUtil.getTime()); flows.put("APPOINT_THREE_STATUS", info.getString("STATUS")); flows.put("APPOINT_THREE_OPINION", info.getString("OPINION")); - flows.put("FLOWS_STEP", 4); xgfFlowsMapper.edit(flows); return "0"; default: @@ -540,21 +541,30 @@ public class XgfUserServiceImpl implements XgfUserService { } return "0"; } else { - entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); - xgfUserMapper.edit(entity); + // TODO 根据是否委托辖区单位进行处理(前端传回来) + switch (flows.getString("FLOWS_TYPE")) { + case "0":// 由股份端审批 + entity.put("CHECK_STATUS", 2); + entity.put("VALID_FLAG", "1"); + entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + xgfUserMapper.edit(entity); + return "1"; + case "1":// 辖区单位审批，需要指定审批人 + entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + entity.put("CHECK_STATUS", 2); + entity.put("VALID_FLAG", "1"); + entity.put("STATUS", "2"); + xgfUserMapper.edit(entity); - flows.put("APPOINT_FOUR_CORP_ID", info.getString("APPOINT_CORP_ID")); - flows.put("APPOINT_FOUR_CORP_NAME", info.getString("APPOINT_CORP_NAME")); - flows.put("APPOINT_FOUR_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); - flows.put("APPOINT_FOUR_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); - flows.put("APPOINT_FOUR_USER_ID", info.getString("APPOINT_USER_ID")); - flows.put("APPOINT_FOUR_USER_NAME", info.getString("APPOINT_USER_NAME")); - flows.put("APPOINT_FOUR_TIME", DateUtil.getTime()); - flows.put("APPOINT_FOUR_STATUS", info.getString("STATUS")); - flows.put("APPOINT_FOUR_OPINION", info.getString("OPINION")); - flows.put("FLOWS_STEP", 5); - xgfFlowsMapper.edit(flows); - return "0"; + flows.put("APPOINT_FOUR_TIME", DateUtil.getTime()); + flows.put("APPOINT_FOUR_STATUS", info.getString("STATUS")); + flows.put("APPOINT_FOUR_OPINION", info.getString("OPINION")); + flows.put("FLOWS_STEP", 4); + xgfFlowsMapper.edit(flows); + return "1"; + default: + throw new RuntimeException("未知的审批类型"); + } } } From 7f3007041e96c031fc767bfe183df50217603ed3 Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 22 Jan 2024 18:47:25 +0800 Subject: [PATCH 24/64] =?UTF-8?q?=E8=8B=A5=E5=B9=B2bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index b629a65a..61bd48c2 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -491,7 +491,7 @@ public class XgfUserServiceImpl implements XgfUserService { return "0"; } else { // TODO 根据是否委托辖区单位进行处理(前端传回来) - switch (info.getString("attorneyFlag")) { + switch (flows.getString("FLOWS_TYPE")) { case "0":// 由股份端审批 entity.put("CHECK_STATUS", 2); entity.put("VALID_FLAG", "1"); From a52ccd1f50393a8966872823597e6789a855d9e4 Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 22 Jan 2024 19:32:40 +0800 Subject: [PATCH 25/64] =?UTF-8?q?=E8=8B=A5=E5=B9=B2bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/xgf/impl/XgfUserServiceImpl.java | 71 ++++++++++++------- 1 file changed, 46 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index 61bd48c2..115371f8 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -207,6 +207,7 @@ public class XgfUserServiceImpl implements XgfUserService { } else { condition.clear(); condition.put("FLOW_ID", flow.getString("FLOW_ID")); + condition.put("STEP_FLAG", "1"); PageData currentNode = flowDetailMapper.selectOne(condition); PageData nextNode = new PageData(); nextNode.putAll(currentNode); @@ -344,27 +345,47 @@ public class XgfUserServiceImpl implements XgfUserService { private String handle(PageData info, PageData flows) throws Exception { PageData condition = new PageData(); switch (Integer.parseInt(flows.get("FLOWS_STEP").toString())) { - case 0:// 相关方端推送数据至企业端 - flows.put("APPOINT_ZERO_TIME", DateUtil.getTime()); - flows.put("APPOINT_ZERO_STATUS", info.getString("STATUS")); - flows.put("APPOINT_ZERO_OPINION", info.getString("OPINION")); - - flows.put("APPOINT_ONE_CORP_TYPE", "0"); - flows.put("APPOINT_ONE_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); - flows.put("APPOINT_ONE_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); - flows.put("APPOINT_ONE_USER_ID", info.getString("APPOINT_USER_ID")); - flows.put("APPOINT_ONE_USER_NAME", info.getString("APPOINT_USER_NAME")); - flows.put("APPOINT_ONE_CORP_ID", flows.getString("APPOINT_ZERO_CORP_ID")); - flows.put("APPOINT_ONE_CORP_NAME", flows.getString("APPOINT_ZERO_CORP_NAME")); - flows.put("FLOWS_STEP", 1); - xgfFlowsMapper.edit(flows); + case 0: {// 相关方端推送数据至企业端 condition.clear(); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); - PageData user = xgfUserMapper.findById(condition); - user.put("CHECK_STEP", 1); - xgfUserMapper.edit(user); - return "0"; - // 相关方选择的审批人审批，并指定下一位监管部门审批人，不过打回相关方端 + PageData entity = xgfUserMapper.findById(condition); + if ("0".equals(info.getString("STATUS"))) { + entity.put("STATUS", "0"); + entity.put("VALID_FLAG", "0"); + entity.put("CHECK_STATUS", "-2"); + PageData key = new PageData(); + key.putAll(entity); + key.put("USER_ID", condition.get("XGF_USER_ID")); + key.put("STATUS", "1"); + Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); + if (result == null || !"succeed".equals(result.get("result"))) { + throw new RuntimeException("请求失败"); + } + xgfUserMapper.edit(entity); + return "0"; + } else { + flows.put("APPOINT_ZERO_TIME", DateUtil.getTime()); + flows.put("APPOINT_ZERO_STATUS", info.getString("STATUS")); + flows.put("APPOINT_ZERO_OPINION", info.getString("OPINION")); + + flows.put("APPOINT_ONE_CORP_TYPE", "0"); + flows.put("APPOINT_ONE_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_ONE_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_ONE_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_ONE_USER_NAME", info.getString("APPOINT_USER_NAME")); + flows.put("APPOINT_ONE_CORP_ID", flows.getString("APPOINT_ZERO_CORP_ID")); + flows.put("APPOINT_ONE_CORP_NAME", flows.getString("APPOINT_ZERO_CORP_NAME")); + flows.put("FLOWS_STEP", 1); + xgfFlowsMapper.edit(flows); + condition.clear(); + condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); + PageData user = xgfUserMapper.findById(condition); + user.put("CHECK_STEP", 1); + xgfUserMapper.edit(user); + return "0"; + } + + } // 相关方选择的审批人审批，并指定下一位监管部门审批人，不过打回相关方端 case 1: { condition.clear(); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); @@ -376,7 +397,7 @@ public class XgfUserServiceImpl implements XgfUserService { PageData key = new PageData(); key.putAll(entity); key.put("USER_ID", condition.get("XGF_USER_ID")); - key.put("STATUS", info.getString("STATUS")); + key.put("STATUS", "1"); Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); if (result == null || !"succeed".equals(result.get("result"))) { throw new RuntimeException("请求失败"); @@ -432,7 +453,7 @@ public class XgfUserServiceImpl implements XgfUserService { PageData key = new PageData(); key.putAll(entity); key.put("USER_ID", condition.get("XGF_USER_ID")); - key.put("STATUS", info.getString("STATUS")); + key.put("STATUS", "1"); Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); if (result == null || !"succeed".equals(result.get("result"))) { throw new RuntimeException("请求失败"); @@ -483,7 +504,7 @@ public class XgfUserServiceImpl implements XgfUserService { PageData key = new PageData(); key.putAll(entity); key.put("USER_ID", condition.get("XGF_USER_ID")); - key.put("STATUS", info.getString("STATUS")); + key.put("STATUS", "1"); Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); if (result == null || !"succeed".equals(result.get("result"))) { throw new RuntimeException("请求失败"); @@ -534,7 +555,7 @@ public class XgfUserServiceImpl implements XgfUserService { PageData key = new PageData(); key.putAll(entity); key.put("USER_ID", condition.get("XGF_USER_ID")); - key.put("STATUS", info.getString("STATUS")); + key.put("STATUS", "1"); Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); if (result == null || !"succeed".equals(result.get("result"))) { throw new RuntimeException("请求失败"); @@ -581,7 +602,7 @@ public class XgfUserServiceImpl implements XgfUserService { PageData key = new PageData(); key.putAll(entity); key.put("USER_ID", condition.get("XGF_USER_ID")); - key.put("STATUS", info.getString("STATUS")); + key.put("STATUS", "1"); Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); if (result == null || !"succeed".equals(result.get("result"))) { throw new RuntimeException("请求失败"); @@ -678,7 +699,7 @@ public class XgfUserServiceImpl implements XgfUserService { String jituandanwei = "1e6dbbe16004402f8d2c0e52afd9a676，3a854eefa7894e06aaa1a2611bca80f6，020578a4c1f04bc692ee25145c2efbe5，90966974de3c4b83aca6f8fd6432d5c2"; if (jituandanwei.contains(corpInfoId)) { return "1"; - }else { + } else { return "0"; } } From b7c071980e3cfda24e1c240941bb033c56603c32 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Tue, 23 Jan 2024 14:24:08 +0800 Subject: [PATCH 26/64] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E9=97=A8?= =?UTF-8?q?=E5=8F=A3=E9=97=A8=E7=A6=81=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=B9=B6=E4=B8=94=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81=E5=8D=A1=E5=8F=B7?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mkmj/MkmjAreaGateController.java | 10 +++--- .../mkmj/MkmjGateLogController.java | 10 +++--- .../datasource/mkmj/MkmjGateLogMapper.xml | 33 +++++++++++++++---- .../mybatis/datasource/system/UsersMapper.xml | 6 ++++ 4 files changed, 43 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/zcloud/controller/mkmj/MkmjAreaGateController.java b/src/main/java/com/zcloud/controller/mkmj/MkmjAreaGateController.java index 5fb3fa82..8f3d0bbe 100644 --- a/src/main/java/com/zcloud/controller/mkmj/MkmjAreaGateController.java +++ b/src/main/java/com/zcloud/controller/mkmj/MkmjAreaGateController.java @@ -37,7 +37,7 @@ public class MkmjAreaGateController extends BaseController { * @throws Exception */ @RequestMapping(value="/add") - @RequiresPermissions("mkmjAreaGate:add") + @RequiresPermissions("mkmjArea:add") @ResponseBody public ReturnMap add() throws Exception{ PageData pd = new PageData(); @@ -56,7 +56,7 @@ public class MkmjAreaGateController extends BaseController { * @throws Exception */ @RequestMapping(value="/delete") - @RequiresPermissions("mkmjAreaGate:del") + @RequiresPermissions("mkmjArea:del") @ResponseBody public ReturnMap delete() throws Exception{ PageData pd = new PageData(); @@ -69,7 +69,7 @@ public class MkmjAreaGateController extends BaseController { * @throws Exception */ @RequestMapping(value="/edit") - @RequiresPermissions("mkmjAreaGate:edit") + @RequiresPermissions("mkmjArea:edit") @ResponseBody public ReturnMap edit() throws Exception{ PageData pd = new PageData(); @@ -84,7 +84,7 @@ public class MkmjAreaGateController extends BaseController { * @throws Exception */ @RequestMapping(value="/list") - @RequiresPermissions("mkmjAreaGate:list") + @RequiresPermissions("mkmjArea:list") @ResponseBody public Object list(Page page) throws Exception{ Map map = new HashMap(); @@ -106,7 +106,7 @@ public class MkmjAreaGateController extends BaseController { * @throws Exception */ @RequestMapping(value="/goEdit") - @RequiresPermissions("mkmjAreaGate:edit") + @RequiresPermissions("mkmjArea:edit") @ResponseBody public Object goEdit() throws Exception{ Map map = new HashMap(); diff --git a/src/main/java/com/zcloud/controller/mkmj/MkmjGateLogController.java b/src/main/java/com/zcloud/controller/mkmj/MkmjGateLogController.java index 56a7736f..ba8f91fc 100644 --- a/src/main/java/com/zcloud/controller/mkmj/MkmjGateLogController.java +++ b/src/main/java/com/zcloud/controller/mkmj/MkmjGateLogController.java @@ -38,7 +38,7 @@ public class MkmjGateLogController extends BaseController { * @throws Exception */ @RequestMapping(value="/add") - @RequiresPermissions("mkmjGateLog:add") + @RequiresPermissions("mkmjArea:add") @ResponseBody public ReturnMap add() throws Exception{ PageData pd = new PageData(); @@ -56,7 +56,7 @@ public class MkmjGateLogController extends BaseController { * @throws Exception */ @RequestMapping(value="/delete") - @RequiresPermissions("mkmjGateLog:del") + @RequiresPermissions("mkmjArea:del") @ResponseBody public ReturnMap delete() throws Exception{ PageData pd = new PageData(); @@ -69,7 +69,7 @@ public class MkmjGateLogController extends BaseController { * @throws Exception */ @RequestMapping(value="/edit") - @RequiresPermissions("mkmjGateLog:edit") + @RequiresPermissions("mkmjArea:edit") @ResponseBody public ReturnMap edit() throws Exception{ PageData pd = new PageData(); @@ -84,7 +84,7 @@ public class MkmjGateLogController extends BaseController { * @throws Exception */ @RequestMapping(value="/list") - @RequiresPermissions("mkmjGateLog:list") + @RequiresPermissions("mkmjArea:list") @ResponseBody public Object list(Page page) throws Exception{ Map map = new HashMap(); @@ -106,7 +106,7 @@ public class MkmjGateLogController extends BaseController { * @throws Exception */ @RequestMapping(value="/goEdit") - @RequiresPermissions("mkmjGateLog:edit") + @RequiresPermissions("mkmjArea:edit") @ResponseBody public Object goEdit() throws Exception{ Map map = new HashMap(); diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjGateLogMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjGateLogMapper.xml index 10dfa80e..b4b17477 100644 --- a/src/main/resources/mybatis/datasource/mkmj/MkmjGateLogMapper.xml +++ b/src/main/resources/mybatis/datasource/mkmj/MkmjGateLogMapper.xml @@ -18,7 +18,8 @@ f.AREA_GATE_ID, f.STATE, f.LOG_TIME, - f.USER_CARD, + f.USER_ID, + f.USER_NAME, f.GATE_TYPE, f.CREATOR, f.CREATTIME, @@ -38,7 +39,8 @@ AREA_GATE_ID, STATE, LOG_TIME, - USER_CARD, + USER_ID, + USER_NAME, GATE_TYPE, CREATOR, CREATTIME, @@ -58,7 +60,8 @@ #{AREA_GATE_ID}, #{STATE}, #{LOG_TIME}, - #{USER_CARD}, + #{USER_ID}, + #{USER_NAME} #{GATE_TYPE}, #{CREATOR}, #{CREATTIME}, @@ -131,9 +134,27 @@ diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index 514370b1..7ab21186 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -91,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" JCR, CORPINFO_ID, CARDNO, + MKMJCARD. ISDELETE @@ -131,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" f.JCR, f.CORPINFO_ID, f.CARDNO, + f.MKMJCARD, f.ISDELETE @@ -168,6 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{JCR}, #{CORPINFO_ID}, #{CARDNO}, + #{MKMJCARD}, #{ISDELETE} @@ -387,6 +390,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ,CARDNO = #{CARDNO} + + ,MKMJCARD = #{MKMJCARD} + ,DURATION = #{DURATION} From 0cd60ce5e3291bd59e45ce578b9043a8a1f7e0b3 Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 23 Jan 2024 15:38:30 +0800 Subject: [PATCH 27/64] =?UTF-8?q?=E8=8B=A5=E5=B9=B2bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/xgf/impl/XgfUserServiceImpl.java | 70 ++++++++++++++----- 1 file changed, 52 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index 115371f8..be8fc426 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -143,7 +143,7 @@ public class XgfUserServiceImpl implements XgfUserService { PageData flows = xgfFlowsMapper.findById(condition); if (flows == null || flows.size() <= 0) { flows = new PageData(); - flows.put("FLOWS_TYPE", getType(x.getString("CORPINOF_ID"))); + flows.put("FLOWS_TYPE", getType(x.getString("CORPINFO_ID"))); flows.put("FLOWS_ID", x.getString("USER_ID")); flows.put("FLOWS_STEP", 0); flows.put("FOREIGN_KEY_ID", x.getString("USER_ID")); @@ -159,7 +159,7 @@ public class XgfUserServiceImpl implements XgfUserService { xgfFlowsMapper.save(flows); } else { flows.put("FLOWS_STEP", 0); - flows.put("FLOWS_TYPE", getType(x.getString("CORPINOF_ID"))); + flows.put("FLOWS_TYPE", getType(x.getString("CORPINFO_ID"))); flows.put("APPOINT_ZERO_CORP_NAME", x.getString("APPOINT_CORP_NAME")); flows.put("APPOINT_ZERO_CORP_ID", x.getString("APPOINT_CORP_ID")); flows.put("APPOINT_ZERO_CORP_TYPE", "0"); @@ -279,7 +279,7 @@ public class XgfUserServiceImpl implements XgfUserService { condition.put("APPOINT_USER_NAME", request.getString("APPOINT_USER_NAME")); // 保存审批记录 - this.saveLog(x, request.getString("STATUS"), this.handle(condition, flows)); + this.saveLog(condition, request.getString("STATUS"), this.handle(condition, flows)); } } @@ -362,6 +362,11 @@ public class XgfUserServiceImpl implements XgfUserService { throw new RuntimeException("请求失败"); } xgfUserMapper.edit(entity); + + flows.put("APPOINT_ZERO_TIME", DateUtil.getTime()); + flows.put("APPOINT_ZERO_STATUS", info.getString("STATUS")); + flows.put("APPOINT_ZERO_OPINION", info.getString("OPINION")); + xgfFlowsMapper.edit(flows); return "0"; } else { flows.put("APPOINT_ZERO_TIME", DateUtil.getTime()); @@ -403,6 +408,11 @@ public class XgfUserServiceImpl implements XgfUserService { throw new RuntimeException("请求失败"); } xgfUserMapper.edit(entity); + + flows.put("APPOINT_ONE_TIME", DateUtil.getTime()); + flows.put("APPOINT_ONE_STATUS", info.getString("STATUS")); + flows.put("APPOINT_ONE_OPINION", info.getString("OPINION")); + xgfFlowsMapper.edit(flows); return "0"; } else { if ("1".equals(flows.getString("FLOWS_TYPE"))) { @@ -427,6 +437,7 @@ public class XgfUserServiceImpl implements XgfUserService { } else { entity.put("CHECK_STATUS", 2); entity.put("VALID_FLAG", "1"); + entity.put("STATUS", "2"); entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); xgfUserMapper.edit(entity); @@ -458,6 +469,10 @@ public class XgfUserServiceImpl implements XgfUserService { if (result == null || !"succeed".equals(result.get("result"))) { throw new RuntimeException("请求失败"); } + flows.put("APPOINT_TWO_TIME", DateUtil.getTime()); + flows.put("APPOINT_TWO_STATUS", info.getString("STATUS")); + flows.put("APPOINT_TWO_OPINION", info.getString("OPINION")); + xgfFlowsMapper.edit(flows); return "0"; } else { // 2、通过审核后，根据不同的流程进行不同的处理 @@ -474,13 +489,13 @@ public class XgfUserServiceImpl implements XgfUserService { entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); xgfUserMapper.edit(entity); - flows.put("APPOINT_TWO_CORP_ID", info.getString("APPOINT_CORP_ID")); - flows.put("APPOINT_TWO_CORP_NAME", info.getString("APPOINT_CORP_NAME")); - flows.put("APPOINT_TWO_CORP_TYPE", "0"); - flows.put("APPOINT_TWO_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); - flows.put("APPOINT_TWO_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); - flows.put("APPOINT_TWO_USER_ID", info.getString("APPOINT_USER_ID")); - flows.put("APPOINT_TWO_USER_NAME", info.getString("APPOINT_USER_NAME")); + flows.put("APPOINT_THREE_CORP_ID", info.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_THREE_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_THREE_CORP_TYPE", "0"); + flows.put("APPOINT_THREE_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_THREE_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_THREE_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_THREE_USER_NAME", info.getString("APPOINT_USER_NAME")); flows.put("APPOINT_TWO_TIME", DateUtil.getTime()); flows.put("APPOINT_TWO_STATUS", info.getString("STATUS")); flows.put("APPOINT_TWO_OPINION", info.getString("OPINION")); @@ -509,6 +524,9 @@ public class XgfUserServiceImpl implements XgfUserService { if (result == null || !"succeed".equals(result.get("result"))) { throw new RuntimeException("请求失败"); } + flows.put("APPOINT_THREE_TIME", DateUtil.getTime()); + flows.put("APPOINT_THREE_STATUS", info.getString("STATUS")); + flows.put("APPOINT_THREE_OPINION", info.getString("OPINION")); return "0"; } else { // TODO 根据是否委托辖区单位进行处理(前端传回来) @@ -560,6 +578,10 @@ public class XgfUserServiceImpl implements XgfUserService { if (result == null || !"succeed".equals(result.get("result"))) { throw new RuntimeException("请求失败"); } + flows.put("APPOINT_FOUR_TIME", DateUtil.getTime()); + flows.put("APPOINT_FOUR_STATUS", info.getString("STATUS")); + flows.put("APPOINT_FOUR_OPINION", info.getString("OPINION")); + xgfFlowsMapper.edit(flows); return "0"; } else { // TODO 根据是否委托辖区单位进行处理(前端传回来) @@ -580,7 +602,7 @@ public class XgfUserServiceImpl implements XgfUserService { flows.put("APPOINT_FOUR_TIME", DateUtil.getTime()); flows.put("APPOINT_FOUR_STATUS", info.getString("STATUS")); flows.put("APPOINT_FOUR_OPINION", info.getString("OPINION")); - flows.put("FLOWS_STEP", 4); + flows.put("FLOWS_STEP", 5); xgfFlowsMapper.edit(flows); return "1"; default: @@ -607,6 +629,10 @@ public class XgfUserServiceImpl implements XgfUserService { if (result == null || !"succeed".equals(result.get("result"))) { throw new RuntimeException("请求失败"); } + flows.put("APPOINT_FIVE_TIME", DateUtil.getTime()); + flows.put("APPOINT_FIVE_STATUS", info.getString("STATUS")); + flows.put("APPOINT_FIVE_OPINION", info.getString("OPINION")); + xgfFlowsMapper.edit(flows); return "0"; } else { entity.put("CHECK_STATUS", 2); @@ -650,11 +676,11 @@ public class XgfUserServiceImpl implements XgfUserService { } } - private void saveLog(String id, String status, String endFlag) throws Exception { + private void saveLog(PageData info, String status, String endFlag) throws Exception { /* 保存审批记录 */ PageData condition = new PageData(); condition.clear(); - condition.put("FOREIGN_KEY", id); + condition.put("FOREIGN_KEY", info.getString("FLOWS_ID")); condition.put("TYPE", "1"); condition.put("VALID_FLAG", "1"); PageData flow = flowMapper.findByCondition(condition); @@ -675,19 +701,27 @@ public class XgfUserServiceImpl implements XgfUserService { nextNode.put("APPROVER_NAME", Jurisdiction.getName()); nextNode.put("APPROVER_TIME", DateUtil.getTime()); nextNode.put("APPROVER_CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - condition.clear(); - condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - PageData corpInfo = corpInfoMapper.findById(condition); - if (corpInfo != null && corpInfo.size() > 0) { - nextNode.put("APPROVER_CORPINFO_NAME", corpInfo.getString("NAME")); + nextNode.put("APPROVER_OPINION", info.get("OPINION")); + if ("1".equals(Jurisdiction.getCORPINFO_ID())) { + nextNode.put("APPROVER_CORPINFO_NAME", "秦皇岛股份有限公司"); + } else { + condition.clear(); + condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData corpInfo = corpInfoMapper.findById(condition); + if (corpInfo != null && corpInfo.size() > 0) { + nextNode.put("APPROVER_CORPINFO_NAME", corpInfo.getString("CORP_NAME")); + } } nextNode.put("PASS_FLAG", status); nextNode.put("END_FLAG", endFlag); nextNode.put("ISDELETE", "0"); nextNode.put("PARENT_ID", currentNode.getString("FLOW_DETAIL_ID")); + flowDetailMapper.save(nextNode); currentNode.put("STEP_FLAG", "0"); flowDetailMapper.edit(currentNode); + flow.put("END_FLAG", endFlag); + flowMapper.edit(flow); } private String getType(String corpInfoId) { From fc979979d0c95afee5bc716e8afe4080b32c3293 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Tue, 23 Jan 2024 17:37:28 +0800 Subject: [PATCH 28/64] =?UTF-8?q?=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=91=84=E5=83=8F=E5=A4=B4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mkmj/MkmjAreaGateController.java | 16 ++ .../mkmj/MkmjGateVideoController.java | 140 +++++++++++++++ .../datasource/mkmj/MkmjAreaGateMapper.java | 6 + .../datasource/mkmj/MkmjGateVideoMapper.java | 64 +++++++ .../service/mkmj/MkmjAreaGateService.java | 6 + .../service/mkmj/MkmjGateVideoService.java | 66 +++++++ .../mkmj/impl/MkmjAreaGateServiceImpl.java | 6 + .../mkmj/impl/MkmjGateVideServiceImpl.java | 99 +++++++++++ .../datasource/mkmj/MkmjAreaGateMapper.xml | 15 ++ .../datasource/mkmj/MkmjGateVideoMapper.xml | 165 ++++++++++++++++++ 10 files changed, 583 insertions(+) create mode 100644 src/main/java/com/zcloud/controller/mkmj/MkmjGateVideoController.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjGateVideoMapper.java create mode 100644 src/main/java/com/zcloud/service/mkmj/MkmjGateVideoService.java create mode 100644 src/main/java/com/zcloud/service/mkmj/impl/MkmjGateVideServiceImpl.java create mode 100644 src/main/resources/mybatis/datasource/mkmj/MkmjGateVideoMapper.xml diff --git a/src/main/java/com/zcloud/controller/mkmj/MkmjAreaGateController.java b/src/main/java/com/zcloud/controller/mkmj/MkmjAreaGateController.java index 8f3d0bbe..47555f1d 100644 --- a/src/main/java/com/zcloud/controller/mkmj/MkmjAreaGateController.java +++ b/src/main/java/com/zcloud/controller/mkmj/MkmjAreaGateController.java @@ -119,4 +119,20 @@ public class MkmjAreaGateController extends BaseController { return map; } + /**定位 + * @param + * @throws Exception + */ + @RequestMapping(value="/savePosition") + @ResponseBody + public Object savePosition() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + mkmjAreaGateService.savePosition(pd); //根据ID读取 + map.put("result", errInfo); + return map; + } + } diff --git a/src/main/java/com/zcloud/controller/mkmj/MkmjGateVideoController.java b/src/main/java/com/zcloud/controller/mkmj/MkmjGateVideoController.java new file mode 100644 index 00000000..7ea6b036 --- /dev/null +++ b/src/main/java/com/zcloud/controller/mkmj/MkmjGateVideoController.java @@ -0,0 +1,140 @@ +package com.zcloud.controller.mkmj; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.map.util.ReturnMap; +import com.zcloud.service.mkmj.MkmjAreaGateService; +import com.zcloud.service.mkmj.MkmjGateVideoService; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.Tools; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：门口门禁区域 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/mkmjGateVideo") +public class MkmjGateVideoController extends BaseController { + + @Autowired + private MkmjGateVideoService mkmjGateVideoService; + + /**新增 + * @param + * @throws Exception + */ + @RequestMapping(value="/add") + @RequiresPermissions("mkmjArea:add") + @ResponseBody + public ReturnMap add() throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 添加时间 + pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 添加人 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 添加时间 + pd.put("ISDELETE", "0"); //是否删除 + pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date()));//修改时间 + return mkmjGateVideoService.save(pd); + } + + /**删除 + * @param + * @throws Exception + */ + @RequestMapping(value="/delete") + @RequiresPermissions("mkmjArea:del") + @ResponseBody + public ReturnMap delete() throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + return mkmjGateVideoService.delete(pd); + } + + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/edit") + @RequiresPermissions("mkmjArea:edit") + @ResponseBody + public ReturnMap edit() throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date()));//修改时间 + return mkmjGateVideoService.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/list") + @RequiresPermissions("mkmjArea:list") + @ResponseBody + public Object list(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + page.setPd(pd); + List varList = mkmjGateVideoService.list(page); //列出Coursectk列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /**去修改页面获取数据 + * @param + * @throws Exception + */ + @RequestMapping(value="/goEdit") + @RequiresPermissions("mkmjArea:edit") + @ResponseBody + public Object goEdit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = mkmjGateVideoService.findById(pd); //根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + + /**定位 + * @param + * @throws Exception + */ + @RequestMapping(value="/savePosition") + @ResponseBody + public Object savePosition() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + mkmjGateVideoService.savePosition(pd); //根据ID读取 + map.put("result", errInfo); + return map; + } + +} diff --git a/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjAreaGateMapper.java b/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjAreaGateMapper.java index 6256a6e9..4ff0ced4 100644 --- a/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjAreaGateMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjAreaGateMapper.java @@ -61,5 +61,11 @@ public interface MkmjAreaGateMapper { * @return */ PageData findByOnly(PageData pageData); + + /** + * 定位 + * @param pd + */ + void savePosition(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjGateVideoMapper.java b/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjGateVideoMapper.java new file mode 100644 index 00000000..cdc7b589 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjGateVideoMapper.java @@ -0,0 +1,64 @@ +package com.zcloud.mapper.datasource.mkmj; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：门口门禁闸机摄像头 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +public interface MkmjGateVideoMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + + /** + * 定位 + * @param pd + */ + void savePosition(PageData pd); +} + diff --git a/src/main/java/com/zcloud/service/mkmj/MkmjAreaGateService.java b/src/main/java/com/zcloud/service/mkmj/MkmjAreaGateService.java index 99a3c9c7..a15b3155 100644 --- a/src/main/java/com/zcloud/service/mkmj/MkmjAreaGateService.java +++ b/src/main/java/com/zcloud/service/mkmj/MkmjAreaGateService.java @@ -56,5 +56,11 @@ public interface MkmjAreaGateService { */ public ReturnMap deleteAll(String[] ArrayDATA_IDS)throws Exception; + /** + * 定位 + * @param pd + * @return + */ + ReturnMap savePosition(PageData pd); } diff --git a/src/main/java/com/zcloud/service/mkmj/MkmjGateVideoService.java b/src/main/java/com/zcloud/service/mkmj/MkmjGateVideoService.java new file mode 100644 index 00000000..e7e605e7 --- /dev/null +++ b/src/main/java/com/zcloud/service/mkmj/MkmjGateVideoService.java @@ -0,0 +1,66 @@ +package com.zcloud.service.mkmj; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.map.util.ReturnMap; + +import java.util.List; + +/** + * 说明：门口门禁区域闸机 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +public interface MkmjGateVideoService { + + /**新增 + * @param pd + * @throws Exception + */ + public ReturnMap save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public ReturnMap delete(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public ReturnMap edit(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public ReturnMap deleteAll(String[] ArrayDATA_IDS)throws Exception; + + /** + * 定位 + * @param pd + * @return + */ + ReturnMap savePosition(PageData pd); +} + diff --git a/src/main/java/com/zcloud/service/mkmj/impl/MkmjAreaGateServiceImpl.java b/src/main/java/com/zcloud/service/mkmj/impl/MkmjAreaGateServiceImpl.java index ec5d53cc..cf72bf25 100644 --- a/src/main/java/com/zcloud/service/mkmj/impl/MkmjAreaGateServiceImpl.java +++ b/src/main/java/com/zcloud/service/mkmj/impl/MkmjAreaGateServiceImpl.java @@ -105,5 +105,11 @@ public class MkmjAreaGateServiceImpl implements MkmjAreaGateService { return returnMap.ok("删除成功"); } + @Override + public ReturnMap savePosition(PageData pd) { + mkmjAreaGateMapper.savePosition(pd); + return ReturnMap.ok("定位成功"); + } + } diff --git a/src/main/java/com/zcloud/service/mkmj/impl/MkmjGateVideServiceImpl.java b/src/main/java/com/zcloud/service/mkmj/impl/MkmjGateVideServiceImpl.java new file mode 100644 index 00000000..5ea257eb --- /dev/null +++ b/src/main/java/com/zcloud/service/mkmj/impl/MkmjGateVideServiceImpl.java @@ -0,0 +1,99 @@ +package com.zcloud.service.mkmj.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.mkmj.MkmjAreaGateMapper; +import com.zcloud.mapper.datasource.mkmj.MkmjGateVideoMapper; +import com.zcloud.service.map.util.ReturnMap; +import com.zcloud.service.mkmj.MkmjAreaGateService; +import com.zcloud.service.mkmj.MkmjGateVideoService; +import com.zcloud.util.UuidUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; + +import java.util.List; + +/** + * 说明：门口门禁区域闸机 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class MkmjGateVideServiceImpl implements MkmjGateVideoService { + + @Autowired + private MkmjGateVideoMapper mkmjGateVideoMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public ReturnMap save(PageData pd)throws Exception{ + mkmjGateVideoMapper.save(pd); + return ReturnMap.ok("保存成功"); + } + + /**删除 + * @param pd + * @throws Exception + */ + public ReturnMap delete(PageData pd)throws Exception{ + mkmjGateVideoMapper.delete(pd); + return ReturnMap.ok("删除成功"); + } + + /**修改 + * @param pd + * @throws Exception + */ + public ReturnMap edit(PageData pd)throws Exception{ + mkmjGateVideoMapper.edit(pd); + return ReturnMap.ok("编辑成功"); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return mkmjGateVideoMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return mkmjGateVideoMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return mkmjGateVideoMapper.findById(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public ReturnMap deleteAll(String[] ArrayDATA_IDS)throws Exception{ + ReturnMap ReturnMap = new ReturnMap(); + mkmjGateVideoMapper.deleteAll(ArrayDATA_IDS); + return ReturnMap.ok("删除成功"); + } + + @Override + public ReturnMap savePosition(PageData pd) { + mkmjGateVideoMapper.savePosition(pd); + return ReturnMap.ok("定位成功"); + } + +} + diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml index 7632348d..a387376c 100644 --- a/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml +++ b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml @@ -19,6 +19,7 @@ f.AREA_ID, f.GATE_NAME, f.GATE_TYPE, + f.GATE_CATEGORY, f.GATE_MODEL, f.GATE_POSITION, f.IS_ADJACENT, @@ -40,6 +41,7 @@ AREA_ID, GATE_NAME, GATE_TYPE, + GATE_CATEGORY, GATE_MODEL, GATE_POSITION, IS_ADJACENT, @@ -61,6 +63,7 @@ #{AREA_ID}, #{GATE_NAME}, #{GATE_TYPE}, + #{GATE_CATEGORY}, #{GATE_MODEL}, #{GATE_POSITION}, #{IS_ADJACENT}, @@ -106,6 +109,7 @@ AREA_ID=#{AREA_ID}, GATE_NAME=#{GATE_NAME}, GATE_TYPE=#{GATE_TYPE}, + GATE_CATEGORY=#{GATE_CATEGORY}, GATE_MODEL=#{GATE_MODEL}, GATE_POSITION=#{GATE_POSITION}, IS_ADJACENT=#{IS_ADJACENT}, @@ -192,4 +196,15 @@ and f.AREA_GATE_ID != #{AREA_GATE_ID} + + + + update + + set + LATITUDE = #{LATITUDE}, + LONGITUDE = #{LONGITUDE} + where + AREA_GATE_ID = #{AREA_GATE_ID} + diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjGateVideoMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjGateVideoMapper.xml new file mode 100644 index 00000000..2f1d7ef9 --- /dev/null +++ b/src/main/resources/mybatis/datasource/mkmj/MkmjGateVideoMapper.xml @@ -0,0 +1,165 @@ + + + + + + + MKMJ_GATE_VIDEO + + + + + SYS_DICTIONARIES + + + + + f.GATE_VIDEO_ID, + f.AREA_GATE_ID, + f.VIDEO_RESOURCES_ID, + f.LONGITUDE, + f.LATITUDE, + f.CORPINFO_ID, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.ISDELETE + + + + + GATE_VIDEO_ID, + AREA_GATE_ID, + VIDEO_RESOURCES_ID, + LONGITUDE, + LATITUDE, + CORPINFO_ID, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, + ISDELETE + + + + + #{GATE_VIDEO_ID}, + #{AREA_GATE_ID}, + #{VIDEO_RESOURCES_ID}, + #{LONGITUDE}, + #{LATITUDE}, + #{CORPINFO_ID}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{ISDELETE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + GATE_VIDEO_ID = #{GATE_VIDEO_ID} + + + + + update + + set + GATE_VIDEO_ID= GATE_VIDEO_ID, + AREA_GATE_ID=#{AREA_GATE_ID}, + VIDEO_RESOURCES_ID=#{VIDEO_RESOURCES_ID}, + LONGITUDE=#{LONGITUDE}, + LATITUDE=#{LATITUDE}, + CORPINFO_ID=#{CORPINFO_ID}, + CREATOR=#{CREATOR}, + CREATTIME=#{CREATTIME}, + OPERATOR=#{OPERATOR}, + OPERATTIME=#{OPERATTIME}, + ISDELETE=#{ISDELETE} + where + GATE_VIDEO_ID=#{GATE_VIDEO_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + GATE_VIDEO_ID in + + #{item} + + + + + + update + + set + LATITUDE = #{LATITUDE}, + LONGITUDE = #{LONGITUDE} + where + GATE_VIDEO_ID = #{GATE_VIDEO_ID} + + From 7cade78064ec01606c7abe5788cf5a1598e069a2 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Tue, 23 Jan 2024 18:55:14 +0800 Subject: [PATCH 29/64] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E6=91=84=E5=83=8F=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/mkmj/impl/MkmjGateVideServiceImpl.java | 1 + src/main/resources/application-dev.properties | 14 ++++++++------ src/main/resources/application.properties | 2 +- .../mybatis/datasource/mkmj/MkmjAreaGateMapper.xml | 10 +++++++++- .../datasource/mkmj/MkmjGateVideoMapper.xml | 14 ++++++++------ 5 files changed, 27 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/zcloud/service/mkmj/impl/MkmjGateVideServiceImpl.java b/src/main/java/com/zcloud/service/mkmj/impl/MkmjGateVideServiceImpl.java index 5ea257eb..16d85775 100644 --- a/src/main/java/com/zcloud/service/mkmj/impl/MkmjGateVideServiceImpl.java +++ b/src/main/java/com/zcloud/service/mkmj/impl/MkmjGateVideServiceImpl.java @@ -33,6 +33,7 @@ public class MkmjGateVideServiceImpl implements MkmjGateVideoService { * @throws Exception */ public ReturnMap save(PageData pd)throws Exception{ + pd.put("GATE_VIDEO_ID",UuidUtil.get32UUID()); mkmjGateVideoMapper.save(pd); return ReturnMap.ok("保存成功"); } diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index a4dd85c3..0c9a8fc0 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -64,18 +64,18 @@ spring.main.banner-mode=off preventionxgf.api.url=http://192.168.0.31:8992/qa-prevention-xgf/ qa-regulatory-gwj.api.url=http://192.168.0.31:8992/qa-regulatory-gwj/ #????? -smb.host=39.103.224.166 +smb.host=192.168.192.201 smb.port=22 smb.user=root -smb.password=Zcloud@zcloud88888 -smb.basePath=/mnt/qgfile/file/ +smb.password=SJSKAQHBGLXT@20220311 +smb.basePath=/mnt/qask/file/ #Mq\u914D\u7F6E rocketmq.consumer.group2=edu-admin-edit rocketmq.consumer.group1=edu-admin-add #rocketmq.name-server=10.0.140.141:9876 #rocketmq.name-server=192.168.0.70:9876 -rocketmq.name-server=192.168.0.31:9876 +rocketmq.name-server=192.168.151.57:9876 rocketmq.producer.group=libmiddle rocketmq.producer.send-message-timeout=3000 rocketmq.producer.compress-message-body-threshold=4096 @@ -96,5 +96,7 @@ mq.gwj.data.topic=czks_qy_docking mq.gwj.file.topic=czks_qy_dockingPicture #港务局文件服务器前缀 baseimgpath=https://qgqy.qhdsafety.com/file/ - -cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd +http.file.url=https://qgqy.qhdsafety.com/file/ +corp.default.pic-path=https://qgqy.qhdsafety.com/ +corp.default.back-end-path=https://qgqy.qhdsafety.com/file/ +cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd/ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 25c549c5..a48eb064 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,7 +3,7 @@ server.port=8091 #?? #spring.profiles.active=local -#����31ʱʹ�� +#31ʱʹ spring.profiles.active=dev #?? #spring.profiles.active=master diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml index a387376c..f27e199e 100644 --- a/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml +++ b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml @@ -139,9 +139,17 @@ select - + , + r.NAME from f + LEFT JOIN `qa-gwj-regulatory`.bus_platformvideomanagement r on r.PLATFORMVIDEOMANAGEMENT_ID = f.PLATFORMVIDEOMANAGEMENT_ID where f.ISDELETE = '0' and @@ -126,7 +128,7 @@ ) - f.AREA_GATE_ID = #{pd.AREA_GATE_ID} + AND f.AREA_GATE_ID = #{pd.AREA_GATE_ID} From ea1871b0bfc184c7fc51c9b710bb480221bd6623 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Tue, 23 Jan 2024 18:56:18 +0800 Subject: [PATCH 30/64] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E6=91=84=E5=83=8F=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/mkmj/impl/MkmjGateVideServiceImpl.java | 1 + .../mybatis/datasource/mkmj/MkmjAreaGateMapper.xml | 10 +++++++++- .../datasource/mkmj/MkmjGateVideoMapper.xml | 14 ++++++++------ 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zcloud/service/mkmj/impl/MkmjGateVideServiceImpl.java b/src/main/java/com/zcloud/service/mkmj/impl/MkmjGateVideServiceImpl.java index 5ea257eb..16d85775 100644 --- a/src/main/java/com/zcloud/service/mkmj/impl/MkmjGateVideServiceImpl.java +++ b/src/main/java/com/zcloud/service/mkmj/impl/MkmjGateVideServiceImpl.java @@ -33,6 +33,7 @@ public class MkmjGateVideServiceImpl implements MkmjGateVideoService { * @throws Exception */ public ReturnMap save(PageData pd)throws Exception{ + pd.put("GATE_VIDEO_ID",UuidUtil.get32UUID()); mkmjGateVideoMapper.save(pd); return ReturnMap.ok("保存成功"); } diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml index a387376c..f27e199e 100644 --- a/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml +++ b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml @@ -139,9 +139,17 @@ select - + , + r.NAME from f + LEFT JOIN `qa-gwj-regulatory`.bus_platformvideomanagement r on r.PLATFORMVIDEOMANAGEMENT_ID = f.PLATFORMVIDEOMANAGEMENT_ID where f.ISDELETE = '0' and @@ -126,7 +128,7 @@ ) - f.AREA_GATE_ID = #{pd.AREA_GATE_ID} + AND f.AREA_GATE_ID = #{pd.AREA_GATE_ID} From a79a9292a212c40b21cc2827f983701c7aad6034 Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 24 Jan 2024 11:43:42 +0800 Subject: [PATCH 31/64] =?UTF-8?q?=E6=B6=88=E9=98=B2=E5=99=A8=E6=9D=90?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=BF=81=E7=A7=BB=E8=87=B3=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../firemanager/FireResourcesController.java | 124 ++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 src/main/java/com/zcloud/controller/firemanager/FireResourcesController.java diff --git a/src/main/java/com/zcloud/controller/firemanager/FireResourcesController.java b/src/main/java/com/zcloud/controller/firemanager/FireResourcesController.java new file mode 100644 index 00000000..6592bb22 --- /dev/null +++ b/src/main/java/com/zcloud/controller/firemanager/FireResourcesController.java @@ -0,0 +1,124 @@ +package com.zcloud.controller.firemanager; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.map.FireResourcesService; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Jurisdiction; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Controller; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.client.RestTemplate; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/fireResources") +public class FireResourcesController extends BaseController { + + @Resource + private FireResourcesService fireResourcesService; + @RequestMapping(value = "/list") + @ResponseBody + public Object page(Page page) { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + page.setPd(pd); + if ("00004".equals(pd.getString("GANGKOU"))) { + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("FIRERESOURCES_NAME", pd.getString("FIRERESOURCES_NAME")); + paramMap.add("FIRERESOURCES_TYPE", pd.getString("FIRERESOURCES_TYPE")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/fireResources/list", paramMap, Map.class); + return result; + } + //获取当前人的公司id + List varList = fireResourcesService.datalistPage(page); + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + @Value("${cfd.prevention.api.url}") + private String cfdUrl; + @Autowired + private RestTemplate restTemplate; + @RequestMapping(value = "/getById") + @ResponseBody + public Object getById() { + Map map = new HashMap(); + String errInfo = "success"; + PageData pddata = this.getPageData(); + if ("00004".equals(pddata.getString("GANGKOU"))) { + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("FIRERESOURCES_ID", pddata.getString("FIRERESOURCES_ID")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/fireResources/getById", paramMap, Map.class); + return result; + } + //获取当前人的公司id + PageData pd = fireResourcesService.getDataById(pddata); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + @RequestMapping(value = "/add") + @ResponseBody + public Object add(@RequestParam(value="FFILE",required=false) MultipartFile[] files) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + String FIRERESOURCES_ID = this.get32UUID(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + pd.put("FIRERESOURCES_ID", FIRERESOURCES_ID); + pd.put("CREATIME", DateUtil.date2Str(new Date())); + pd.put("OPERATIME", DateUtil.date2Str(new Date())); + pd.put("ISDELETE", "0"); + fireResourcesService.save(pd,files); + map.put("result", errInfo); + return map; + } + + @RequestMapping(value = "/edit") + @ResponseBody + public Object edit(@RequestParam(value="FFILE",required=false) MultipartFile[] files) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + pd.put("OPERATIME", DateUtil.date2Str(new Date())); + pd.put("ISDELETE", "0"); + fireResourcesService.edit(pd,files); + map.put("result", errInfo); + return map; + } + + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(Page page) { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + fireResourcesService.delete(pd); + map.put("result", errInfo); + return map; + } +} From fd28a121da173ed0bd9bc9e4e02c5ffcb11d4117 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Wed, 24 Jan 2024 15:43:20 +0800 Subject: [PATCH 32/64] =?UTF-8?q?=E7=9B=B8=E9=82=BB=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml index f27e199e..e26e7379 100644 --- a/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml +++ b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml @@ -140,7 +140,8 @@ + select + + from + f + where + f.ISDELETE = '0' + AND f.PLATFORMVIDEOMANAGEMENT_ID = #{PLATFORMVIDEOMANAGEMENT_ID} + AND f.AREA_GATE_ID = #{AREA_GATE_ID} + From 6ba0eb1cdd2e95a9930437b0899382fbd33fb312 Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 25 Jan 2024 14:49:42 +0800 Subject: [PATCH 34/64] =?UTF-8?q?dev=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 1db9c3fa..53082d08 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -61,7 +61,7 @@ spring.main.banner-mode=off # #qa-regulatory-gwj.api.url=http://192.168.0.79:8008 -preventionxgf.api.url=http://192.168.0.31:8992/qa-prevention-xgf/ +preventionxgf.api.url=https://qgxgf.qhdsafety.com/qa-prevention-xgf/ qa-regulatory-gwj.api.url=http://192.168.0.31:8992/qa-regulatory-gwj/ #????? smb.host=39.103.224.166 From faed220f73120adc7029678cb0f8cfd2cc9fe4c6 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Thu, 25 Jan 2024 17:40:54 +0800 Subject: [PATCH 35/64] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86=20=20=E8=A7=86=E9=A2=91=E7=9C=8B=E4=B8=8D?= =?UTF-8?q?=E4=BA=86=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../keyProjects/PlatformvideomanagementController.java | 6 +++--- .../mybatis/datasource/mkmj/MkmjAreaGateMapper.xml | 1 + .../resources/mybatis/datasource/mkmj/MkmjAreaMapper.xml | 1 + .../mybatis/datasource/mkmj/MkmjGateVideoMapper.xml | 4 +++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java b/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java index 9b536ed7..0f41a466 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java @@ -55,7 +55,7 @@ public class PlatformvideomanagementController extends BaseController { Map map = new HashMap(); PageData pd =this.getPageData(); map = HKUtil.camerasPreviewURLs(pd.getString("INDEXCODE"),"hls"); - if(!ObjectUtils.isEmpty(map)){ + if(ObjectUtils.isEmpty(map)){ map = new HashMap(); } map.put("result", "success"); @@ -71,7 +71,7 @@ public class PlatformvideomanagementController extends BaseController { Map map = new HashMap(); PageData pd =this.getPageData(); map = HKUtil.camerasPreviewURLs(pd.getString("INDEXCODE"),"rtsp"); - if(!ObjectUtils.isEmpty(map)){ + if(ObjectUtils.isEmpty(map)){ map = new HashMap(); } map.put("result", "success"); @@ -87,7 +87,7 @@ public class PlatformvideomanagementController extends BaseController { Map map = new HashMap(); PageData pd =this.getPageData(); map = HKUtil.cameraSearch(pd); - if(!ObjectUtils.isEmpty(map)){ + if(ObjectUtils.isEmpty(map)){ map = new HashMap(); } map.put("result", "success"); diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml index e26e7379..0bf78803 100644 --- a/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml +++ b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml @@ -156,6 +156,7 @@ and ( + f.GATE_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') and ( + f.AREA_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') and ( + r.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') and f.AREA_ID=#{pd.AREA_ID} + ORDER BY f.CREATTIME DESC diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjAreaMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaMapper.xml index 4056b692..a71e15c0 100644 --- a/src/main/resources/mybatis/datasource/mkmj/MkmjAreaMapper.xml +++ b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaMapper.xml @@ -136,6 +136,7 @@ and f.AREA_PARENT_ID=#{pd.AREA_PARENT_ID} + ORDER BY f.CREATTIME DESC diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjGateLogMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjGateLogMapper.xml index b4b17477..4b5d0bdd 100644 --- a/src/main/resources/mybatis/datasource/mkmj/MkmjGateLogMapper.xml +++ b/src/main/resources/mybatis/datasource/mkmj/MkmjGateLogMapper.xml @@ -169,6 +169,7 @@ and g.AREA_ID=#{pd.AREA_ID} + ORDER BY f.LOG_TIME DESC diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjGateVideoMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjGateVideoMapper.xml index caac1ad9..cef4d84c 100644 --- a/src/main/resources/mybatis/datasource/mkmj/MkmjGateVideoMapper.xml +++ b/src/main/resources/mybatis/datasource/mkmj/MkmjGateVideoMapper.xml @@ -132,6 +132,7 @@ AND f.AREA_GATE_ID = #{pd.AREA_GATE_ID} + ORDER BY f.CREATTIME DESC From 0f331c3972e2493232a183144d0d82d5e9f24842 Mon Sep 17 00:00:00 2001 From: liujun Date: Sat, 27 Jan 2024 15:57:51 +0800 Subject: [PATCH 38/64] =?UTF-8?q?13862=20=E9=80=89=E6=8B=A9=E7=AC=AC?= =?UTF-8?q?=E4=BA=8C=E4=B8=AA=E5=AE=A1=E6=89=B9=20=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zcloud/service/xgf/impl/XgfUserServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index 706fa988..634723d2 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -379,8 +379,9 @@ public class XgfUserServiceImpl implements XgfUserService { flows.put("APPOINT_ONE_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); flows.put("APPOINT_ONE_USER_ID", info.getString("APPOINT_USER_ID")); flows.put("APPOINT_ONE_USER_NAME", info.getString("APPOINT_USER_NAME")); - flows.put("APPOINT_ONE_CORP_ID", flows.getString("APPOINT_ZERO_CORP_ID")); - flows.put("APPOINT_ONE_CORP_NAME", flows.getString("APPOINT_ZERO_CORP_NAME")); + // TODO 企业端审批人 + flows.put("APPOINT_ONE_CORP_ID", ""); + flows.put("APPOINT_ONE_CORP_NAME", ""); flows.put("FLOWS_STEP", 1); xgfFlowsMapper.edit(flows); condition.clear(); @@ -532,13 +533,13 @@ public class XgfUserServiceImpl implements XgfUserService { } else { // TODO 根据是否委托辖区单位进行处理(前端传回来) switch (flows.getString("FLOWS_TYPE")) { - case "0":// 由股份端审批 + case "1":// 由股份端审批 entity.put("CHECK_STATUS", 2); entity.put("VALID_FLAG", "1"); entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); xgfUserMapper.edit(entity); return "1"; - case "1":// 辖区单位审批，需要指定审批人 + case "0":// 辖区单位审批，需要指定审批人 entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); xgfUserMapper.edit(entity); From 2d6bbf03d7f99d5a33ffc8a582ca0d23f0cb8f02 Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 29 Jan 2024 13:20:28 +0800 Subject: [PATCH 39/64] =?UTF-8?q?1=E3=80=81=E6=B5=81=E7=A8=8B=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=BF=9D=E5=AD=98=E9=94=99=E8=AF=AFbug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=202=E3=80=81=E6=89=93=E5=9B=9E=E5=90=8E=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=AE=A1=E6=89=B9bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/xgf/XgfUserController.java | 14 +++++++++++ .../datasource/xgf/FlowDetailMapper.java | 4 ++++ .../mapper/datasource/xgf/FlowMapper.java | 4 ++++ .../zcloud/service/xgf/XgfUserService.java | 2 ++ .../service/xgf/impl/XgfUserServiceImpl.java | 24 +++++++++++++++++++ .../datasource/xgf/FlowDetailMapper.xml | 17 +++++++++++++ .../mybatis/datasource/xgf/FlowMapper.xml | 16 +++++++++++++ 7 files changed, 81 insertions(+) diff --git a/src/main/java/com/zcloud/controller/xgf/XgfUserController.java b/src/main/java/com/zcloud/controller/xgf/XgfUserController.java index 22d6d78d..edbf89cd 100644 --- a/src/main/java/com/zcloud/controller/xgf/XgfUserController.java +++ b/src/main/java/com/zcloud/controller/xgf/XgfUserController.java @@ -124,4 +124,18 @@ public class XgfUserController extends BaseController { response.put("data", request); return response; } + + /** + * 人员指定审核 + */ + @RequestMapping(value = "/getApproveInfo") + @ResponseBody + public Object getApproveInfo() throws Exception{ + PageData request = this.getPageData(); + PageData response = new PageData(); + response.put("list", xgfUserService.getApproveInfo(request)); + response.put("result", "success"); + response.put("data", request); + return response; + } } diff --git a/src/main/java/com/zcloud/mapper/datasource/xgf/FlowDetailMapper.java b/src/main/java/com/zcloud/mapper/datasource/xgf/FlowDetailMapper.java index 37ab6211..9e91a697 100644 --- a/src/main/java/com/zcloud/mapper/datasource/xgf/FlowDetailMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/xgf/FlowDetailMapper.java @@ -2,6 +2,8 @@ package com.zcloud.mapper.datasource.xgf; import com.zcloud.entity.PageData; +import java.util.List; + public interface FlowDetailMapper { void save(PageData flow); @@ -13,4 +15,6 @@ public interface FlowDetailMapper { PageData findById(PageData flow); PageData selectOne(PageData condition); + + List getList(PageData condition); } diff --git a/src/main/java/com/zcloud/mapper/datasource/xgf/FlowMapper.java b/src/main/java/com/zcloud/mapper/datasource/xgf/FlowMapper.java index 160baf67..93e7faf0 100644 --- a/src/main/java/com/zcloud/mapper/datasource/xgf/FlowMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/xgf/FlowMapper.java @@ -2,6 +2,8 @@ package com.zcloud.mapper.datasource.xgf; import com.zcloud.entity.PageData; +import java.util.List; + public interface FlowMapper { void save(PageData flow); @@ -13,4 +15,6 @@ public interface FlowMapper { PageData findById(PageData flow); PageData findByCondition(PageData condition); + + List getList(PageData condition); } diff --git a/src/main/java/com/zcloud/service/xgf/XgfUserService.java b/src/main/java/com/zcloud/service/xgf/XgfUserService.java index 47ee65ad..86b86b84 100644 --- a/src/main/java/com/zcloud/service/xgf/XgfUserService.java +++ b/src/main/java/com/zcloud/service/xgf/XgfUserService.java @@ -26,4 +26,6 @@ public interface XgfUserService { List findRecordList(PageData condition) throws Exception; List getAppointApproveList(Page page); + + Object getApproveInfo(PageData request); } diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index 634723d2..14111ff8 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -215,6 +215,10 @@ public class XgfUserServiceImpl implements XgfUserService { nextNode.put("SORT", Integer.parseInt(currentNode.get("SORT").toString()) + 1); nextNode.put("PARENT_ID", currentNode.getString("FLOW_DETAIL_ID")); nextNode.put("STEP_NAME", "相关方数据将人员打回后重新发送给企业端"); + nextNode.put("PASS_FLAG", "1"); + nextNode.put("APPROVER_TIME", DateUtil.getTime()); + nextNode.put("APPROVER_ID", ""); + nextNode.put("APPROVER_NAME", ""); flowDetailMapper.save(nextNode); currentNode.put("STEP_FLAG", "0"); flowDetailMapper.edit(currentNode); @@ -303,6 +307,20 @@ public class XgfUserServiceImpl implements XgfUserService { return list; } + @Override + public Object getApproveInfo(PageData request) { + PageData condition = new PageData(); + condition.put("FOREIGN_KEY", request.getString("XGF_USER_ID")); + condition.put("TYPE", "1"); + List list = flowMapper.getList(condition); + for(PageData x : list){ + condition.clear(); + condition.put("FLOW_ID", x.getString("FLOW_ID")); + x.put("flow",flowDetailMapper.getList(condition)); + } + return list; + } + /* 获取当前用户是否有权限审批 */ private String getPower(PageData x) { switch (Integer.parseInt(x.get("CHECK_STEP").toString())) { @@ -483,6 +501,7 @@ public class XgfUserServiceImpl implements XgfUserService { entity.put("CHECK_STATUS", 2); entity.put("VALID_FLAG", "1"); entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + entity.put("STATUS", "2"); xgfUserMapper.edit(entity); return "1"; case "1":// 集团单位审批，需要指定下一位人员进行审批 @@ -526,9 +545,11 @@ public class XgfUserServiceImpl implements XgfUserService { if (result == null || !"succeed".equals(result.get("result"))) { throw new RuntimeException("请求失败"); } + xgfUserMapper.edit(entity); flows.put("APPOINT_THREE_TIME", DateUtil.getTime()); flows.put("APPOINT_THREE_STATUS", info.getString("STATUS")); flows.put("APPOINT_THREE_OPINION", info.getString("OPINION")); + xgfFlowsMapper.edit(flows); return "0"; } else { // TODO 根据是否委托辖区单位进行处理(前端传回来) @@ -537,6 +558,7 @@ public class XgfUserServiceImpl implements XgfUserService { entity.put("CHECK_STATUS", 2); entity.put("VALID_FLAG", "1"); entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + entity.put("STATUS", "2"); xgfUserMapper.edit(entity); return "1"; case "0":// 辖区单位审批，需要指定审批人 @@ -592,6 +614,7 @@ public class XgfUserServiceImpl implements XgfUserService { entity.put("CHECK_STATUS", 2); entity.put("VALID_FLAG", "1"); entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + entity.put("STATUS", "2"); xgfUserMapper.edit(entity); return "1"; case "1":// 辖区单位审批，需要指定审批人 @@ -640,6 +663,7 @@ public class XgfUserServiceImpl implements XgfUserService { entity.put("CHECK_STATUS", 2); entity.put("VALID_FLAG", "1"); entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + entity.put("STATUS", "2"); xgfUserMapper.edit(entity); return "1"; } diff --git a/src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml b/src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml index 238c3b06..68702d01 100644 --- a/src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml @@ -133,4 +133,21 @@ and a.FOREIGN_KEY = #{FOREIGN_KEY} + diff --git a/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml b/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml index c0ab1b4e..c9ca4481 100644 --- a/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml @@ -98,4 +98,20 @@ and a.VALID_FLAG = #{VALID_FLAG} + From 00d78e12aaa55b379e6f96b3dc44fc293ab5151b Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 29 Jan 2024 14:04:25 +0800 Subject: [PATCH 40/64] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E8=AF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index 14111ff8..0689ca72 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -219,6 +219,7 @@ public class XgfUserServiceImpl implements XgfUserService { nextNode.put("APPROVER_TIME", DateUtil.getTime()); nextNode.put("APPROVER_ID", ""); nextNode.put("APPROVER_NAME", ""); + nextNode.put("APPROVER_OPINION", ""); flowDetailMapper.save(nextNode); currentNode.put("STEP_FLAG", "0"); flowDetailMapper.edit(currentNode); From 9db1215e2563783e4cf6713763c10b859da071b6 Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 29 Jan 2024 14:51:43 +0800 Subject: [PATCH 41/64] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E4=B8=AD=E5=AE=A1=E6=89=B9=E6=84=8F=E8=A7=81=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/xgf/XgfUserController.java | 1 + .../zcloud/service/xgf/XgfUserService.java | 2 + .../service/xgf/impl/XgfUserServiceImpl.java | 100 ++++++++++++++++++ 3 files changed, 103 insertions(+) diff --git a/src/main/java/com/zcloud/controller/xgf/XgfUserController.java b/src/main/java/com/zcloud/controller/xgf/XgfUserController.java index edbf89cd..456b15c8 100644 --- a/src/main/java/com/zcloud/controller/xgf/XgfUserController.java +++ b/src/main/java/com/zcloud/controller/xgf/XgfUserController.java @@ -134,6 +134,7 @@ public class XgfUserController extends BaseController { PageData request = this.getPageData(); PageData response = new PageData(); response.put("list", xgfUserService.getApproveInfo(request)); + response.put("flow", xgfUserService.getFlowInfo(request)); response.put("result", "success"); response.put("data", request); return response; diff --git a/src/main/java/com/zcloud/service/xgf/XgfUserService.java b/src/main/java/com/zcloud/service/xgf/XgfUserService.java index 86b86b84..eb0c20a5 100644 --- a/src/main/java/com/zcloud/service/xgf/XgfUserService.java +++ b/src/main/java/com/zcloud/service/xgf/XgfUserService.java @@ -28,4 +28,6 @@ public interface XgfUserService { List getAppointApproveList(Page page); Object getApproveInfo(PageData request); + + Object getFlowInfo(PageData request); } diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index 0689ca72..06cc58a4 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -13,6 +13,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -322,6 +323,105 @@ public class XgfUserServiceImpl implements XgfUserService { return list; } + @Override + public Object getFlowInfo(PageData request) { + PageData condition = new PageData(); + condition.put("FLOWS_ID", request.getString("XGF_USER_ID")); + + PageData entity = xgfFlowsMapper.findById(condition); + + List list = new ArrayList<>(); + + PageData zero = new PageData(); + zero.put("INDEX", "0"); + zero.put("APPOINT_CORP_ID", entity.getString("APPOINT_ZERO_CORP_ID")); + zero.put("APPOINT_CORP_NAME", entity.getString("APPOINT_ZERO_CORP_NAME")); + zero.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_ZERO_DEPARTMENT_ID")); + zero.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_ZERO_DEPARTMENT_NAME")); + zero.put("APPOINT_USER_ID", entity.getString("APPOINT_ZERO_USER_ID")); + zero.put("APPOINT_USER_NAME", entity.getString("APPOINT_ZERO_USER_NAME")); + zero.put("APPOINT_STATUS", entity.getString("APPOINT_ZERO_STATUS")); + zero.put("APPOINT_OPINION", entity.getString("APPOINT_ZERO_OPINION")); + zero.put("APPOINT_TIME", entity.getString("APPOINT_ZERO_TIME")); + list.add(zero); + PageData one = new PageData(); + one.put("INDEX", "1"); + one.put("APPOINT_CORP_ID", entity.getString("APPOINT_ONE_CORP_ID")); + one.put("APPOINT_CORP_NAME", entity.getString("APPOINT_ONE_CORP_NAME")); + one.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_ONE_DEPARTMENT_ID")); + one.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_ONE_DEPARTMENT_NAME")); + one.put("APPOINT_USER_ID", entity.getString("APPOINT_ONE_USER_ID")); + one.put("APPOINT_USER_NAME", entity.getString("APPOINT_ONE_USER_NAME")); + one.put("APPOINT_STATUS", entity.getString("APPOINT_ONE_STATUS")); + one.put("APPOINT_OPINION", entity.getString("APPOINT_ONE_OPINION")); + one.put("APPOINT_TIME", entity.getString("APPOINT_ONE_TIME")); + list.add(one); + PageData two = new PageData(); + two.put("INDEX", "2"); + two.put("APPOINT_CORP_ID", entity.getString("APPOINT_TWO_CORP_ID")); + two.put("APPOINT_CORP_NAME", entity.getString("APPOINT_TWO_CORP_NAME")); + two.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_TWO_DEPARTMENT_ID")); + two.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_TWO_DEPARTMENT_NAME")); + two.put("APPOINT_USER_ID", entity.getString("APPOINT_TWO_USER_ID")); + two.put("APPOINT_USER_NAME", entity.getString("APPOINT_TWO_USER_NAME")); + two.put("APPOINT_STATUS", entity.getString("APPOINT_TWO_STATUS")); + two.put("APPOINT_OPINION", entity.getString("APPOINT_TWO_OPINION")); + two.put("APPOINT_TIME", entity.getString("APPOINT_TWO_TIME")); + list.add(two); + PageData three = new PageData(); + three.put("INDEX", "3"); + three.put("APPOINT_CORP_ID", entity.getString("APPOINT_THREE_CORP_ID")); + three.put("APPOINT_CORP_NAME", entity.getString("APPOINT_THREE_CORP_NAME")); + three.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_THREE_DEPARTMENT_ID")); + three.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_THREE_DEPARTMENT_NAME")); + three.put("APPOINT_USER_ID", entity.getString("APPOINT_THREE_USER_ID")); + three.put("APPOINT_USER_NAME", entity.getString("APPOINT_THREE_USER_NAME")); + three.put("APPOINT_STATUS", entity.getString("APPOINT_THREE_STATUS")); + three.put("APPOINT_OPINION", entity.getString("APPOINT_THREE_OPINION")); + three.put("APPOINT_TIME", entity.getString("APPOINT_THREE_TIME")); + list.add(three); + PageData four = new PageData(); + four.put("INDEX", "4"); + four.put("APPOINT_CORP_ID", entity.getString("APPOINT_FOUR_CORP_ID")); + four.put("APPOINT_CORP_NAME", entity.getString("APPOINT_FOUR_CORP_NAME")); + four.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_FOUR_DEPARTMENT_ID")); + four.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_FOUR_DEPARTMENT_NAME")); + four.put("APPOINT_USER_ID", entity.getString("APPOINT_FOUR_USER_ID")); + four.put("APPOINT_USER_NAME", entity.getString("APPOINT_FOUR_USER_NAME")); + four.put("APPOINT_STATUS", entity.getString("APPOINT_FOUR_STATUS")); + four.put("APPOINT_OPINION", entity.getString("APPOINT_FOUR_OPINION")); + four.put("APPOINT_TIME", entity.getString("APPOINT_FOUR_TIME")); + list.add(four); + PageData five = new PageData(); + five.put("INDEX", "5"); + five.put("APPOINT_CORP_ID", entity.getString("APPOINT_FIVE_CORP_ID")); + five.put("APPOINT_CORP_NAME", entity.getString("APPOINT_FIVE_CORP_NAME")); + five.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_FIVE_DEPARTMENT_ID")); + five.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_FIVE_DEPARTMENT_NAME")); + five.put("APPOINT_USER_ID", entity.getString("APPOINT_FIVE_USER_ID")); + five.put("APPOINT_USER_NAME", entity.getString("APPOINT_FIVE_USER_NAME")); + five.put("APPOINT_STATUS", entity.getString("APPOINT_FIVE_STATUS")); + five.put("APPOINT_OPINION", entity.getString("APPOINT_FIVE_OPINION")); + five.put("APPOINT_TIME", entity.getString("APPOINT_FIVE_TIME")); + list.add(five); + PageData six = new PageData(); + six.put("INDEX", "6"); + six.put("APPOINT_CORP_ID", entity.getString("APPOINT_SIX_CORP_ID")); + six.put("APPOINT_CORP_NAME", entity.getString("APPOINT_SIX_CORP_NAME")); + six.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_SIX_DEPARTMENT_ID")); + six.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_SIX_DEPARTMENT_NAME")); + six.put("APPOINT_USER_ID", entity.getString("APPOINT_SIX_USER_ID")); + six.put("APPOINT_USER_NAME", entity.getString("APPOINT_SIX_USER_NAME")); + six.put("APPOINT_STATUS", entity.getString("APPOINT_SIX_STATUS")); + six.put("APPOINT_OPINION", entity.getString("APPOINT_SIX_OPINION")); + six.put("APPOINT_TIME", entity.getString("APPOINT_SIX_TIME")); + list.add(six); + PageData info = new PageData(); + info.put("info", list); + info.put("STEP", entity.getString("FLOWS_STEP")); + return info; + } + /* 获取当前用户是否有权限审批 */ private String getPower(PageData x) { switch (Integer.parseInt(x.get("CHECK_STEP").toString())) { From 48a42cd1732821a811d834da8d84a55106e8ac25 Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 29 Jan 2024 17:20:49 +0800 Subject: [PATCH 42/64] =?UTF-8?q?1=E3=80=81=E9=94=99=E5=88=AB=E5=AD=97?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=202=E3=80=81=E7=9B=91=E7=AE=A1=E7=AB=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2sql=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9=203?= =?UTF-8?q?=E3=80=81=E8=A1=A8=E5=8D=95=E6=8F=90=E4=BA=A4=E5=90=8E=E6=9C=AA?= =?UTF-8?q?=E6=B8=85=E7=A9=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index 06cc58a4..c04e767b 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -590,6 +590,7 @@ public class XgfUserServiceImpl implements XgfUserService { if (result == null || !"succeed".equals(result.get("result"))) { throw new RuntimeException("请求失败"); } + xgfUserMapper.edit(entity); flows.put("APPOINT_TWO_TIME", DateUtil.getTime()); flows.put("APPOINT_TWO_STATUS", info.getString("STATUS")); flows.put("APPOINT_TWO_OPINION", info.getString("OPINION")); @@ -703,6 +704,7 @@ public class XgfUserServiceImpl implements XgfUserService { if (result == null || !"succeed".equals(result.get("result"))) { throw new RuntimeException("请求失败"); } + xgfUserMapper.edit(entity); flows.put("APPOINT_FOUR_TIME", DateUtil.getTime()); flows.put("APPOINT_FOUR_STATUS", info.getString("STATUS")); flows.put("APPOINT_FOUR_OPINION", info.getString("OPINION")); @@ -755,6 +757,7 @@ public class XgfUserServiceImpl implements XgfUserService { if (result == null || !"succeed".equals(result.get("result"))) { throw new RuntimeException("请求失败"); } + xgfUserMapper.edit(entity); flows.put("APPOINT_FIVE_TIME", DateUtil.getTime()); flows.put("APPOINT_FIVE_STATUS", info.getString("STATUS")); flows.put("APPOINT_FIVE_OPINION", info.getString("OPINION")); From e4dccddf68d2a4c69aebee11ca2ea57a563a813d Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 30 Jan 2024 12:03:01 +0800 Subject: [PATCH 43/64] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E8=AE=B0=E5=BD=95=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/xgf/impl/XgfUserServiceImpl.java | 84 ++++++++----------- 1 file changed, 37 insertions(+), 47 deletions(-) diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index c04e767b..628efef2 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -198,8 +198,8 @@ public class XgfUserServiceImpl implements XgfUserService { flowDetail.put("APPROVER_ID", ""); flowDetail.put("APPROVER_NAME", ""); flowDetail.put("APPROVER_TIME", DateUtil.getTime()); - flowDetail.put("APPROVER_CORPINFO_ID", ""); - flowDetail.put("APPROVER_CORPINFO_NAME", ""); + flowDetail.put("APPROVER_CORPINFO_ID", entity.getString("BELONG_TO_CORP")); + flowDetail.put("APPROVER_CORPINFO_NAME", entity.getString("BELONG_TO_CORP_NAME")); flowDetail.put("PASS_FLAG", "1"); flowDetail.put("END_FLAG", "0"); flowDetail.put("ISDELETE", "0"); @@ -221,6 +221,8 @@ public class XgfUserServiceImpl implements XgfUserService { nextNode.put("APPROVER_ID", ""); nextNode.put("APPROVER_NAME", ""); nextNode.put("APPROVER_OPINION", ""); + nextNode.put("APPROVER_CORPINFO_ID", entity.getString("BELONG_TO_CORP")); + nextNode.put("APPROVER_CORPINFO_NAME", entity.getString("BELONG_TO_CORP_NAME")); flowDetailMapper.save(nextNode); currentNode.put("STEP_FLAG", "0"); flowDetailMapper.edit(currentNode); @@ -419,6 +421,14 @@ public class XgfUserServiceImpl implements XgfUserService { PageData info = new PageData(); info.put("info", list); info.put("STEP", entity.getString("FLOWS_STEP")); + + condition.clear(); + condition.put("XGF_USER_ID", request.getString("XGF_USER_ID")); + PageData userInfo = xgfUserMapper.findById(condition); + if (userInfo == null || userInfo.size() == 0) { + throw new RuntimeException("未找到该用户详细信息"); + } + info.put("endFlag", userInfo.getString("CHECK_STATUS")); return info; } @@ -469,6 +479,9 @@ public class XgfUserServiceImpl implements XgfUserService { condition.clear(); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); + flows.put("APPOINT_ZERO_TIME", DateUtil.getTime()); + flows.put("APPOINT_ZERO_STATUS", info.getString("STATUS")); + flows.put("APPOINT_ZERO_OPINION", info.getString("OPINION")); if ("0".equals(info.getString("STATUS"))) { entity.put("STATUS", "0"); entity.put("VALID_FLAG", "0"); @@ -482,25 +495,14 @@ public class XgfUserServiceImpl implements XgfUserService { throw new RuntimeException("请求失败"); } xgfUserMapper.edit(entity); - - flows.put("APPOINT_ZERO_TIME", DateUtil.getTime()); - flows.put("APPOINT_ZERO_STATUS", info.getString("STATUS")); - flows.put("APPOINT_ZERO_OPINION", info.getString("OPINION")); xgfFlowsMapper.edit(flows); return "0"; } else { - flows.put("APPOINT_ZERO_TIME", DateUtil.getTime()); - flows.put("APPOINT_ZERO_STATUS", info.getString("STATUS")); - flows.put("APPOINT_ZERO_OPINION", info.getString("OPINION")); - flows.put("APPOINT_ONE_CORP_TYPE", "0"); flows.put("APPOINT_ONE_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); flows.put("APPOINT_ONE_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); flows.put("APPOINT_ONE_USER_ID", info.getString("APPOINT_USER_ID")); flows.put("APPOINT_ONE_USER_NAME", info.getString("APPOINT_USER_NAME")); - // TODO 企业端审批人 - flows.put("APPOINT_ONE_CORP_ID", ""); - flows.put("APPOINT_ONE_CORP_NAME", ""); flows.put("FLOWS_STEP", 1); xgfFlowsMapper.edit(flows); condition.clear(); @@ -516,6 +518,11 @@ public class XgfUserServiceImpl implements XgfUserService { condition.clear(); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); + flows.put("APPOINT_ONE_CORP_ID", "1"); + flows.put("APPOINT_ONE_CORP_NAME", "秦港股份公司"); + flows.put("APPOINT_ONE_TIME", DateUtil.getTime()); + flows.put("APPOINT_ONE_STATUS", info.getString("STATUS")); + flows.put("APPOINT_ONE_OPINION", info.getString("OPINION")); if ("0".equals(info.getString("STATUS"))) { entity.put("STATUS", "0"); entity.put("VALID_FLAG", "0"); @@ -529,10 +536,6 @@ public class XgfUserServiceImpl implements XgfUserService { throw new RuntimeException("请求失败"); } xgfUserMapper.edit(entity); - - flows.put("APPOINT_ONE_TIME", DateUtil.getTime()); - flows.put("APPOINT_ONE_STATUS", info.getString("STATUS")); - flows.put("APPOINT_ONE_OPINION", info.getString("OPINION")); xgfFlowsMapper.edit(flows); return "0"; } else { @@ -548,11 +551,6 @@ public class XgfUserServiceImpl implements XgfUserService { flows.put("APPOINT_TWO_USER_ID", info.getString("APPOINT_USER_ID")); flows.put("APPOINT_TWO_USER_NAME", info.getString("APPOINT_USER_NAME")); flows.put("FLOWS_STEP", 2); - - flows.put("APPOINT_ONE_TIME", DateUtil.getTime()); - flows.put("APPOINT_ONE_STATUS", info.getString("STATUS")); - flows.put("APPOINT_ONE_OPINION", info.getString("OPINION")); - xgfFlowsMapper.edit(flows); return "0"; } else { @@ -561,12 +559,7 @@ public class XgfUserServiceImpl implements XgfUserService { entity.put("STATUS", "2"); entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); xgfUserMapper.edit(entity); - - flows.put("APPOINT_ONE_TIME", DateUtil.getTime()); - flows.put("APPOINT_ONE_STATUS", info.getString("STATUS")); - flows.put("APPOINT_ONE_OPINION", info.getString("OPINION")); flows.put("FLOWS_STEP", 2); - xgfFlowsMapper.edit(flows); return "1"; } @@ -577,6 +570,11 @@ public class XgfUserServiceImpl implements XgfUserService { condition.clear(); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); + flows.put("APPOINT_TWO_CORP_ID", Jurisdiction.getCORPINFO_ID()); + flows.put("APPOINT_TWO_CORP_NAME", "秦港股份公司"); + flows.put("APPOINT_TWO_TIME", DateUtil.getTime()); + flows.put("APPOINT_TWO_STATUS", info.getString("STATUS")); + flows.put("APPOINT_TWO_OPINION", info.getString("OPINION")); // 1、判断是否通过审核 if ("0".equals(info.getString("STATUS"))) { entity.put("STATUS", "0"); @@ -591,9 +589,6 @@ public class XgfUserServiceImpl implements XgfUserService { throw new RuntimeException("请求失败"); } xgfUserMapper.edit(entity); - flows.put("APPOINT_TWO_TIME", DateUtil.getTime()); - flows.put("APPOINT_TWO_STATUS", info.getString("STATUS")); - flows.put("APPOINT_TWO_OPINION", info.getString("OPINION")); xgfFlowsMapper.edit(flows); return "0"; } else { @@ -605,6 +600,7 @@ public class XgfUserServiceImpl implements XgfUserService { entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); entity.put("STATUS", "2"); xgfUserMapper.edit(entity); + xgfFlowsMapper.edit(flows); return "1"; case "1":// 集团单位审批，需要指定下一位人员进行审批 entity.put("CHECK_STATUS", 1); @@ -619,9 +615,6 @@ public class XgfUserServiceImpl implements XgfUserService { flows.put("APPOINT_THREE_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); flows.put("APPOINT_THREE_USER_ID", info.getString("APPOINT_USER_ID")); flows.put("APPOINT_THREE_USER_NAME", info.getString("APPOINT_USER_NAME")); - flows.put("APPOINT_TWO_TIME", DateUtil.getTime()); - flows.put("APPOINT_TWO_STATUS", info.getString("STATUS")); - flows.put("APPOINT_TWO_OPINION", info.getString("OPINION")); flows.put("FLOWS_STEP", 3); xgfFlowsMapper.edit(flows); return "0"; @@ -634,6 +627,11 @@ public class XgfUserServiceImpl implements XgfUserService { condition.clear(); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); + flows.put("APPOINT_THREE_CORP_ID", "1"); + flows.put("APPOINT_THREE_CORP_NAME", "秦港股份公司"); + flows.put("APPOINT_THREE_TIME", DateUtil.getTime()); + flows.put("APPOINT_THREE_STATUS", info.getString("STATUS")); + flows.put("APPOINT_THREE_OPINION", info.getString("OPINION")); // 1、判断是否通过审核 if ("0".equals(info.getString("STATUS"))) { entity.put("STATUS", "0"); @@ -648,9 +646,6 @@ public class XgfUserServiceImpl implements XgfUserService { throw new RuntimeException("请求失败"); } xgfUserMapper.edit(entity); - flows.put("APPOINT_THREE_TIME", DateUtil.getTime()); - flows.put("APPOINT_THREE_STATUS", info.getString("STATUS")); - flows.put("APPOINT_THREE_OPINION", info.getString("OPINION")); xgfFlowsMapper.edit(flows); return "0"; } else { @@ -674,10 +669,6 @@ public class XgfUserServiceImpl implements XgfUserService { flows.put("APPOINT_FOUR_USER_ID", info.getString("APPOINT_USER_ID")); flows.put("APPOINT_FOUR_USER_NAME", info.getString("APPOINT_USER_NAME")); flows.put("FLOWS_STEP", 4); - - flows.put("APPOINT_THREE_TIME", DateUtil.getTime()); - flows.put("APPOINT_THREE_STATUS", info.getString("STATUS")); - flows.put("APPOINT_THREE_OPINION", info.getString("OPINION")); xgfFlowsMapper.edit(flows); return "0"; default: @@ -691,6 +682,11 @@ public class XgfUserServiceImpl implements XgfUserService { condition.clear(); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); + flows.put("APPOINT_FOUR_CORP_ID", "1"); + flows.put("APPOINT_FOUR_CORP_NAME", "秦港股份公司"); + flows.put("APPOINT_FOUR_TIME", DateUtil.getTime()); + flows.put("APPOINT_FOUR_STATUS", info.getString("STATUS")); + flows.put("APPOINT_FOUR_OPINION", info.getString("OPINION")); // 1、判断是否通过审核 if ("0".equals(info.getString("STATUS"))) { entity.put("STATUS", "0"); @@ -705,9 +701,6 @@ public class XgfUserServiceImpl implements XgfUserService { throw new RuntimeException("请求失败"); } xgfUserMapper.edit(entity); - flows.put("APPOINT_FOUR_TIME", DateUtil.getTime()); - flows.put("APPOINT_FOUR_STATUS", info.getString("STATUS")); - flows.put("APPOINT_FOUR_OPINION", info.getString("OPINION")); xgfFlowsMapper.edit(flows); return "0"; } else { @@ -719,6 +712,7 @@ public class XgfUserServiceImpl implements XgfUserService { entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); entity.put("STATUS", "2"); xgfUserMapper.edit(entity); + xgfFlowsMapper.edit(flows); return "1"; case "1":// 辖区单位审批，需要指定审批人 entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); @@ -726,10 +720,6 @@ public class XgfUserServiceImpl implements XgfUserService { entity.put("VALID_FLAG", "1"); entity.put("STATUS", "2"); xgfUserMapper.edit(entity); - - flows.put("APPOINT_FOUR_TIME", DateUtil.getTime()); - flows.put("APPOINT_FOUR_STATUS", info.getString("STATUS")); - flows.put("APPOINT_FOUR_OPINION", info.getString("OPINION")); flows.put("FLOWS_STEP", 5); xgfFlowsMapper.edit(flows); return "1"; From 7cdaacec8c49e2115debd494a2c054fdb23f3ad6 Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 30 Jan 2024 13:49:14 +0800 Subject: [PATCH 44/64] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E3=80=81?= =?UTF-8?q?=E8=82=A1=E4=BB=BD=E7=AB=AF=EF=BC=8C=E7=9B=B8=E5=85=B3=E6=96=B9?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=AF=A6=E6=83=85=E4=BF=A1=E6=81=AF=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/xgf/XgfUserController.java | 2 +- .../service/xgf/impl/XgfUserServiceImpl.java | 197 ++++++++++-------- 2 files changed, 108 insertions(+), 91 deletions(-) diff --git a/src/main/java/com/zcloud/controller/xgf/XgfUserController.java b/src/main/java/com/zcloud/controller/xgf/XgfUserController.java index 456b15c8..30e5c597 100644 --- a/src/main/java/com/zcloud/controller/xgf/XgfUserController.java +++ b/src/main/java/com/zcloud/controller/xgf/XgfUserController.java @@ -126,7 +126,7 @@ public class XgfUserController extends BaseController { } /** - * 人员指定审核 + * 查看审批信息 */ @RequestMapping(value = "/getApproveInfo") @ResponseBody diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index 628efef2..41b3d6b7 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -335,89 +335,104 @@ public class XgfUserServiceImpl implements XgfUserService { List list = new ArrayList<>(); PageData zero = new PageData(); - zero.put("INDEX", "0"); - zero.put("APPOINT_CORP_ID", entity.getString("APPOINT_ZERO_CORP_ID")); - zero.put("APPOINT_CORP_NAME", entity.getString("APPOINT_ZERO_CORP_NAME")); - zero.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_ZERO_DEPARTMENT_ID")); - zero.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_ZERO_DEPARTMENT_NAME")); - zero.put("APPOINT_USER_ID", entity.getString("APPOINT_ZERO_USER_ID")); - zero.put("APPOINT_USER_NAME", entity.getString("APPOINT_ZERO_USER_NAME")); - zero.put("APPOINT_STATUS", entity.getString("APPOINT_ZERO_STATUS")); - zero.put("APPOINT_OPINION", entity.getString("APPOINT_ZERO_OPINION")); - zero.put("APPOINT_TIME", entity.getString("APPOINT_ZERO_TIME")); - list.add(zero); - PageData one = new PageData(); - one.put("INDEX", "1"); - one.put("APPOINT_CORP_ID", entity.getString("APPOINT_ONE_CORP_ID")); - one.put("APPOINT_CORP_NAME", entity.getString("APPOINT_ONE_CORP_NAME")); - one.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_ONE_DEPARTMENT_ID")); - one.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_ONE_DEPARTMENT_NAME")); - one.put("APPOINT_USER_ID", entity.getString("APPOINT_ONE_USER_ID")); - one.put("APPOINT_USER_NAME", entity.getString("APPOINT_ONE_USER_NAME")); - one.put("APPOINT_STATUS", entity.getString("APPOINT_ONE_STATUS")); - one.put("APPOINT_OPINION", entity.getString("APPOINT_ONE_OPINION")); - one.put("APPOINT_TIME", entity.getString("APPOINT_ONE_TIME")); - list.add(one); - PageData two = new PageData(); - two.put("INDEX", "2"); - two.put("APPOINT_CORP_ID", entity.getString("APPOINT_TWO_CORP_ID")); - two.put("APPOINT_CORP_NAME", entity.getString("APPOINT_TWO_CORP_NAME")); - two.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_TWO_DEPARTMENT_ID")); - two.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_TWO_DEPARTMENT_NAME")); - two.put("APPOINT_USER_ID", entity.getString("APPOINT_TWO_USER_ID")); - two.put("APPOINT_USER_NAME", entity.getString("APPOINT_TWO_USER_NAME")); - two.put("APPOINT_STATUS", entity.getString("APPOINT_TWO_STATUS")); - two.put("APPOINT_OPINION", entity.getString("APPOINT_TWO_OPINION")); - two.put("APPOINT_TIME", entity.getString("APPOINT_TWO_TIME")); - list.add(two); - PageData three = new PageData(); - three.put("INDEX", "3"); - three.put("APPOINT_CORP_ID", entity.getString("APPOINT_THREE_CORP_ID")); - three.put("APPOINT_CORP_NAME", entity.getString("APPOINT_THREE_CORP_NAME")); - three.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_THREE_DEPARTMENT_ID")); - three.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_THREE_DEPARTMENT_NAME")); - three.put("APPOINT_USER_ID", entity.getString("APPOINT_THREE_USER_ID")); - three.put("APPOINT_USER_NAME", entity.getString("APPOINT_THREE_USER_NAME")); - three.put("APPOINT_STATUS", entity.getString("APPOINT_THREE_STATUS")); - three.put("APPOINT_OPINION", entity.getString("APPOINT_THREE_OPINION")); - three.put("APPOINT_TIME", entity.getString("APPOINT_THREE_TIME")); - list.add(three); - PageData four = new PageData(); - four.put("INDEX", "4"); - four.put("APPOINT_CORP_ID", entity.getString("APPOINT_FOUR_CORP_ID")); - four.put("APPOINT_CORP_NAME", entity.getString("APPOINT_FOUR_CORP_NAME")); - four.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_FOUR_DEPARTMENT_ID")); - four.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_FOUR_DEPARTMENT_NAME")); - four.put("APPOINT_USER_ID", entity.getString("APPOINT_FOUR_USER_ID")); - four.put("APPOINT_USER_NAME", entity.getString("APPOINT_FOUR_USER_NAME")); - four.put("APPOINT_STATUS", entity.getString("APPOINT_FOUR_STATUS")); - four.put("APPOINT_OPINION", entity.getString("APPOINT_FOUR_OPINION")); - four.put("APPOINT_TIME", entity.getString("APPOINT_FOUR_TIME")); - list.add(four); - PageData five = new PageData(); - five.put("INDEX", "5"); - five.put("APPOINT_CORP_ID", entity.getString("APPOINT_FIVE_CORP_ID")); - five.put("APPOINT_CORP_NAME", entity.getString("APPOINT_FIVE_CORP_NAME")); - five.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_FIVE_DEPARTMENT_ID")); - five.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_FIVE_DEPARTMENT_NAME")); - five.put("APPOINT_USER_ID", entity.getString("APPOINT_FIVE_USER_ID")); - five.put("APPOINT_USER_NAME", entity.getString("APPOINT_FIVE_USER_NAME")); - five.put("APPOINT_STATUS", entity.getString("APPOINT_FIVE_STATUS")); - five.put("APPOINT_OPINION", entity.getString("APPOINT_FIVE_OPINION")); - five.put("APPOINT_TIME", entity.getString("APPOINT_FIVE_TIME")); - list.add(five); - PageData six = new PageData(); - six.put("INDEX", "6"); - six.put("APPOINT_CORP_ID", entity.getString("APPOINT_SIX_CORP_ID")); - six.put("APPOINT_CORP_NAME", entity.getString("APPOINT_SIX_CORP_NAME")); - six.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_SIX_DEPARTMENT_ID")); - six.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_SIX_DEPARTMENT_NAME")); - six.put("APPOINT_USER_ID", entity.getString("APPOINT_SIX_USER_ID")); - six.put("APPOINT_USER_NAME", entity.getString("APPOINT_SIX_USER_NAME")); - six.put("APPOINT_STATUS", entity.getString("APPOINT_SIX_STATUS")); - six.put("APPOINT_OPINION", entity.getString("APPOINT_SIX_OPINION")); - six.put("APPOINT_TIME", entity.getString("APPOINT_SIX_TIME")); - list.add(six); + int index = Integer.parseInt(entity.getString("FLOWS_STEP")); + if (index >= 0){ + zero.put("INDEX", "0"); + zero.put("APPOINT_CORP_ID", entity.getString("APPOINT_ZERO_CORP_ID")); + zero.put("APPOINT_CORP_NAME", entity.getString("APPOINT_ZERO_CORP_NAME")); + zero.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_ZERO_DEPARTMENT_ID")); + zero.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_ZERO_DEPARTMENT_NAME")); + zero.put("APPOINT_USER_ID", entity.getString("APPOINT_ZERO_USER_ID")); + zero.put("APPOINT_USER_NAME", entity.getString("APPOINT_ZERO_USER_NAME")); + zero.put("APPOINT_STATUS", entity.getString("APPOINT_ZERO_STATUS")); + zero.put("APPOINT_OPINION", entity.getString("APPOINT_ZERO_OPINION")); + zero.put("APPOINT_TIME", entity.getString("APPOINT_ZERO_TIME")); + list.add(zero); + } + if (index >= 1) { + PageData one = new PageData(); + one.put("INDEX", "1"); + one.put("APPOINT_CORP_ID", entity.getString("APPOINT_ONE_CORP_ID")); + one.put("APPOINT_CORP_NAME", entity.getString("APPOINT_ONE_CORP_NAME")); + one.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_ONE_DEPARTMENT_ID")); + one.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_ONE_DEPARTMENT_NAME")); + one.put("APPOINT_USER_ID", entity.getString("APPOINT_ONE_USER_ID")); + one.put("APPOINT_USER_NAME", entity.getString("APPOINT_ONE_USER_NAME")); + one.put("APPOINT_STATUS", entity.getString("APPOINT_ONE_STATUS")); + one.put("APPOINT_OPINION", entity.getString("APPOINT_ONE_OPINION")); + one.put("APPOINT_TIME", entity.getString("APPOINT_ONE_TIME")); + list.add(one); + } + if (index >= 2) { + PageData two = new PageData(); + two.put("INDEX", "2"); + two.put("APPOINT_CORP_ID", entity.getString("APPOINT_TWO_CORP_ID")); + two.put("APPOINT_CORP_NAME", entity.getString("APPOINT_TWO_CORP_NAME")); + two.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_TWO_DEPARTMENT_ID")); + two.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_TWO_DEPARTMENT_NAME")); + two.put("APPOINT_USER_ID", entity.getString("APPOINT_TWO_USER_ID")); + two.put("APPOINT_USER_NAME", entity.getString("APPOINT_TWO_USER_NAME")); + two.put("APPOINT_STATUS", entity.getString("APPOINT_TWO_STATUS")); + two.put("APPOINT_OPINION", entity.getString("APPOINT_TWO_OPINION")); + two.put("APPOINT_TIME", entity.getString("APPOINT_TWO_TIME")); + list.add(two); + } + if (index >= 3) { + PageData three = new PageData(); + three.put("INDEX", "3"); + three.put("APPOINT_CORP_ID", entity.getString("APPOINT_THREE_CORP_ID")); + three.put("APPOINT_CORP_NAME", entity.getString("APPOINT_THREE_CORP_NAME")); + three.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_THREE_DEPARTMENT_ID")); + three.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_THREE_DEPARTMENT_NAME")); + three.put("APPOINT_USER_ID", entity.getString("APPOINT_THREE_USER_ID")); + three.put("APPOINT_USER_NAME", entity.getString("APPOINT_THREE_USER_NAME")); + three.put("APPOINT_STATUS", entity.getString("APPOINT_THREE_STATUS")); + three.put("APPOINT_OPINION", entity.getString("APPOINT_THREE_OPINION")); + three.put("APPOINT_TIME", entity.getString("APPOINT_THREE_TIME")); + list.add(three); + } + if (index >= 4) { + PageData four = new PageData(); + four.put("INDEX", "4"); + four.put("APPOINT_CORP_ID", entity.getString("APPOINT_FOUR_CORP_ID")); + four.put("APPOINT_CORP_NAME", entity.getString("APPOINT_FOUR_CORP_NAME")); + four.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_FOUR_DEPARTMENT_ID")); + four.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_FOUR_DEPARTMENT_NAME")); + four.put("APPOINT_USER_ID", entity.getString("APPOINT_FOUR_USER_ID")); + four.put("APPOINT_USER_NAME", entity.getString("APPOINT_FOUR_USER_NAME")); + four.put("APPOINT_STATUS", entity.getString("APPOINT_FOUR_STATUS")); + four.put("APPOINT_OPINION", entity.getString("APPOINT_FOUR_OPINION")); + four.put("APPOINT_TIME", entity.getString("APPOINT_FOUR_TIME")); + list.add(four); + } + if (index >= 5) { + PageData five = new PageData(); + five.put("INDEX", "5"); + five.put("APPOINT_CORP_ID", entity.getString("APPOINT_FIVE_CORP_ID")); + five.put("APPOINT_CORP_NAME", entity.getString("APPOINT_FIVE_CORP_NAME")); + five.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_FIVE_DEPARTMENT_ID")); + five.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_FIVE_DEPARTMENT_NAME")); + five.put("APPOINT_USER_ID", entity.getString("APPOINT_FIVE_USER_ID")); + five.put("APPOINT_USER_NAME", entity.getString("APPOINT_FIVE_USER_NAME")); + five.put("APPOINT_STATUS", entity.getString("APPOINT_FIVE_STATUS")); + five.put("APPOINT_OPINION", entity.getString("APPOINT_FIVE_OPINION")); + five.put("APPOINT_TIME", entity.getString("APPOINT_FIVE_TIME")); + list.add(five); + } + if (index >= 6) { + PageData six = new PageData(); + six.put("INDEX", "6"); + six.put("APPOINT_CORP_ID", entity.getString("APPOINT_SIX_CORP_ID")); + six.put("APPOINT_CORP_NAME", entity.getString("APPOINT_SIX_CORP_NAME")); + six.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_SIX_DEPARTMENT_ID")); + six.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_SIX_DEPARTMENT_NAME")); + six.put("APPOINT_USER_ID", entity.getString("APPOINT_SIX_USER_ID")); + six.put("APPOINT_USER_NAME", entity.getString("APPOINT_SIX_USER_NAME")); + six.put("APPOINT_STATUS", entity.getString("APPOINT_SIX_STATUS")); + six.put("APPOINT_OPINION", entity.getString("APPOINT_SIX_OPINION")); + six.put("APPOINT_TIME", entity.getString("APPOINT_SIX_TIME")); + list.add(six); + } PageData info = new PageData(); info.put("info", list); info.put("STEP", entity.getString("FLOWS_STEP")); @@ -474,6 +489,8 @@ public class XgfUserServiceImpl implements XgfUserService { private String handle(PageData info, PageData flows) throws Exception { PageData condition = new PageData(); + condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData corpEntity = corpInfoMapper.findById(condition); switch (Integer.parseInt(flows.get("FLOWS_STEP").toString())) { case 0: {// 相关方端推送数据至企业端 condition.clear(); @@ -518,8 +535,8 @@ public class XgfUserServiceImpl implements XgfUserService { condition.clear(); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); - flows.put("APPOINT_ONE_CORP_ID", "1"); - flows.put("APPOINT_ONE_CORP_NAME", "秦港股份公司"); + flows.put("APPOINT_ONE_CORP_ID", Jurisdiction.getUSER_ID()); + flows.put("APPOINT_ONE_CORP_NAME", entity.getString("CORP_NAME")); flows.put("APPOINT_ONE_TIME", DateUtil.getTime()); flows.put("APPOINT_ONE_STATUS", info.getString("STATUS")); flows.put("APPOINT_ONE_OPINION", info.getString("OPINION")); @@ -571,7 +588,7 @@ public class XgfUserServiceImpl implements XgfUserService { condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); flows.put("APPOINT_TWO_CORP_ID", Jurisdiction.getCORPINFO_ID()); - flows.put("APPOINT_TWO_CORP_NAME", "秦港股份公司"); + flows.put("APPOINT_TWO_CORP_NAME", entity.getString("CORP_NAME")); flows.put("APPOINT_TWO_TIME", DateUtil.getTime()); flows.put("APPOINT_TWO_STATUS", info.getString("STATUS")); flows.put("APPOINT_TWO_OPINION", info.getString("OPINION")); @@ -627,8 +644,8 @@ public class XgfUserServiceImpl implements XgfUserService { condition.clear(); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); - flows.put("APPOINT_THREE_CORP_ID", "1"); - flows.put("APPOINT_THREE_CORP_NAME", "秦港股份公司"); + flows.put("APPOINT_THREE_CORP_ID", Jurisdiction.getCORPINFO_ID()); + flows.put("APPOINT_THREE_CORP_NAME", entity.getString("CORP_NAME")); flows.put("APPOINT_THREE_TIME", DateUtil.getTime()); flows.put("APPOINT_THREE_STATUS", info.getString("STATUS")); flows.put("APPOINT_THREE_OPINION", info.getString("OPINION")); @@ -682,8 +699,8 @@ public class XgfUserServiceImpl implements XgfUserService { condition.clear(); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); - flows.put("APPOINT_FOUR_CORP_ID", "1"); - flows.put("APPOINT_FOUR_CORP_NAME", "秦港股份公司"); + flows.put("APPOINT_FOUR_CORP_ID", Jurisdiction.getCORPINFO_ID()); + flows.put("APPOINT_FOUR_CORP_NAME", entity.getString("CORP_NAME")); flows.put("APPOINT_FOUR_TIME", DateUtil.getTime()); flows.put("APPOINT_FOUR_STATUS", info.getString("STATUS")); flows.put("APPOINT_FOUR_OPINION", info.getString("OPINION")); From 7096647336507abe4d07d6300a16a86d0866b20a Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 30 Jan 2024 15:21:00 +0800 Subject: [PATCH 45/64] =?UTF-8?q?1=E3=80=81=E5=AE=A1=E6=89=B9=E7=AC=AC?= =?UTF-8?q?=E4=BA=8C=E8=8A=82=E7=82=B9=E6=B2=A1=E6=9C=89=E5=AD=98=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E6=84=8F=E8=A7=81bug=E4=BF=AE=E5=A4=8D=202=E3=80=81?= =?UTF-8?q?=E4=BF=AE=E5=88=AB=E5=AD=97=E4=BF=AE=E6=94=B9=203=E3=80=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/service/xgf/impl/XgfUserServiceImpl.java | 10 ++++++---- .../mybatis/datasource/xgf/XgfFlowsMapper.xml | 8 ++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index 41b3d6b7..f18af2b2 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -99,6 +99,8 @@ public class XgfUserServiceImpl implements XgfUserService { if (regDepartmentEntity.size() > 0) { x.put("MAIN_DEPARTMENT_NAME", regDepartmentEntity.get("NAME")); } + entity = new PageData(); + entity.putAll(x); xgfUserMapper.save(x); xgfUserDetailsMapper.save(x); } else { @@ -536,7 +538,7 @@ public class XgfUserServiceImpl implements XgfUserService { condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); flows.put("APPOINT_ONE_CORP_ID", Jurisdiction.getUSER_ID()); - flows.put("APPOINT_ONE_CORP_NAME", entity.getString("CORP_NAME")); + flows.put("APPOINT_ONE_CORP_NAME", corpEntity.getString("CORP_NAME")); flows.put("APPOINT_ONE_TIME", DateUtil.getTime()); flows.put("APPOINT_ONE_STATUS", info.getString("STATUS")); flows.put("APPOINT_ONE_OPINION", info.getString("OPINION")); @@ -588,7 +590,7 @@ public class XgfUserServiceImpl implements XgfUserService { condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); flows.put("APPOINT_TWO_CORP_ID", Jurisdiction.getCORPINFO_ID()); - flows.put("APPOINT_TWO_CORP_NAME", entity.getString("CORP_NAME")); + flows.put("APPOINT_TWO_CORP_NAME", corpEntity.getString("CORP_NAME")); flows.put("APPOINT_TWO_TIME", DateUtil.getTime()); flows.put("APPOINT_TWO_STATUS", info.getString("STATUS")); flows.put("APPOINT_TWO_OPINION", info.getString("OPINION")); @@ -645,7 +647,7 @@ public class XgfUserServiceImpl implements XgfUserService { condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); flows.put("APPOINT_THREE_CORP_ID", Jurisdiction.getCORPINFO_ID()); - flows.put("APPOINT_THREE_CORP_NAME", entity.getString("CORP_NAME")); + flows.put("APPOINT_THREE_CORP_NAME", corpEntity.getString("CORP_NAME")); flows.put("APPOINT_THREE_TIME", DateUtil.getTime()); flows.put("APPOINT_THREE_STATUS", info.getString("STATUS")); flows.put("APPOINT_THREE_OPINION", info.getString("OPINION")); @@ -700,7 +702,7 @@ public class XgfUserServiceImpl implements XgfUserService { condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); flows.put("APPOINT_FOUR_CORP_ID", Jurisdiction.getCORPINFO_ID()); - flows.put("APPOINT_FOUR_CORP_NAME", entity.getString("CORP_NAME")); + flows.put("APPOINT_FOUR_CORP_NAME", corpEntity.getString("CORP_NAME")); flows.put("APPOINT_FOUR_TIME", DateUtil.getTime()); flows.put("APPOINT_FOUR_STATUS", info.getString("STATUS")); flows.put("APPOINT_FOUR_OPINION", info.getString("OPINION")); diff --git a/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml index 1270676c..5b7725af 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml @@ -40,6 +40,8 @@ f.APPOINT_TWO_DEPARTMENT_NAME, f.APPOINT_TWO_USER_ID, f.APPOINT_TWO_USER_NAME, + f.APPOINT_TWO_STATUS, + f.APPOINT_TWO_OPINION, f.APPOINT_TWO_TIME, f.APPOINT_THREE_CORP_ID, f.APPOINT_THREE_CORP_NAME, @@ -123,6 +125,8 @@ APPOINT_TWO_DEPARTMENT_NAME, APPOINT_TWO_USER_ID, APPOINT_TWO_USER_NAME, + APPOINT_TWO_STATUS, + APPOINT_TWO_OPINION, APPOINT_TWO_TIME, APPOINT_THREE_CORP_ID, APPOINT_THREE_CORP_NAME, @@ -206,6 +210,8 @@ #{APPOINT_TWO_DEPARTMENT_NAME}, #{APPOINT_TWO_USER_ID}, #{APPOINT_TWO_USER_NAME}, + #{APPOINT_TWO_STATUS}, + #{APPOINT_TWO_OPINION}, #{APPOINT_TWO_TIME}, #{APPOINT_THREE_CORP_ID}, #{APPOINT_THREE_CORP_NAME}, @@ -301,6 +307,8 @@ APPOINT_TWO_DEPARTMENT_NAME = #{APPOINT_TWO_DEPARTMENT_NAME}, APPOINT_TWO_USER_ID = #{APPOINT_TWO_USER_ID}, APPOINT_TWO_USER_NAME = #{APPOINT_TWO_USER_NAME}, + APPOINT_TWO_STATUS = #{APPOINT_TWO_STATUS}, + APPOINT_TWO_OPINION = #{APPOINT_TWO_OPINION}, APPOINT_TWO_TIME = #{APPOINT_TWO_TIME}, APPOINT_THREE_CORP_ID = #{APPOINT_THREE_CORP_ID}, APPOINT_THREE_CORP_NAME = #{APPOINT_THREE_CORP_NAME}, From f9b2f057a596b46e521bc4bf136b5ed2169fd76d Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Tue, 30 Jan 2024 18:00:19 +0800 Subject: [PATCH 46/64] =?UTF-8?q?=E5=85=AB=E9=A1=B9=E4=BD=9C=E4=B8=9Abug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/datasource/map/MapEightMapper.java | 52 +- .../service/map/impl/MapEightServiceImpl.java | 81 +- .../mybatis/datasource/map/MapEightMapper.xml | 1558 +++++++++-------- 3 files changed, 896 insertions(+), 795 deletions(-) diff --git a/src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java b/src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java index f8fe4c5f..b4fc09d5 100644 --- a/src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java @@ -15,7 +15,7 @@ import java.util.Map; public interface MapEightMapper { - List getCorpinfoIds(String[] ArrayDATA_IDS); + List getCorpinfoIds(String[] ArrayDATA_IDS); /** * 获取柱状图 @@ -359,11 +359,11 @@ public interface MapEightMapper { */ List listAllMeasuresCUTROADOrder(PageData pd); - /** - * 动火获取字典展示 - * @param shuzu - * @return - */ + /** + * 动火获取字典展示 + * @param shuzu + * @return + */ List getListDongHuo(List shuzu); /** @@ -397,5 +397,45 @@ public interface MapEightMapper { List findByHOISTINGAcceptuserId(PageData pd); List findByHOISTINGAcceptuserIds(PageData pd); + + /**有限空间作业查询 + * @param pd + * @throws Exception + */ + PageData findByIdCONFINEDSPACEOrder(PageData pd); + + /**有限空间作业措施查询 + * @param pd + * @throws Exception + */ + List listAllMeasuresCONFINEDSPACEOrder(PageData pd); + + /** + * 有限空间 + * @param pd + * @return + */ + List listAllCONFINEDSPACEOrder(PageData pd); + + /** + * 有限空间 + * @param pd + * @return + */ + List findByIdCONFINEDSPACEAcceptuser(PageData pd); + + /** + * 有限空间 + * @param pd + * @return + */ + List findByIdCONFINEDSPACEAcceptusers(PageData pd); + + /** + * 有限空间气体检测 + * @param pd + * @return + */ + PageData findByIdCONFINEDSPACEGasWH(PageData pd); } diff --git a/src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java index bd1316c3..b2286731 100644 --- a/src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java +++ b/src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java @@ -3,6 +3,7 @@ package com.zcloud.service.map.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.map.MapEightMapper; +import com.zcloud.service.bus.CorpInfoService; import com.zcloud.service.map.MapEightService; import com.zcloud.util.Tools; import org.apache.commons.lang.StringUtils; @@ -12,6 +13,7 @@ import org.springframework.transaction.annotation.Transactional; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * 说明：实时地图八项工作 @@ -26,8 +28,8 @@ public class MapEightServiceImpl implements MapEightService { @Autowired private MapEightMapper mapEightMapper; - @Override - public List getCorpinfoIds(PageData pd) { + @Override + public List getCorpinfoIds(PageData pd) { String area = pd.getString("AREA"); if(StringUtils.isNotBlank(area)){ String[] ArrayDATA_IDS = area.split(","); @@ -39,12 +41,12 @@ public class MapEightServiceImpl implements MapEightService { return mapEightMapper.getCorpinfoIds(ArrayDATA_IDS); } return new ArrayList<>(); - } + } - @Override + @Override public Object getEcharts(PageData pd) { Map returnMap = new HashMap<>(); - String errInfo = "success"; + String errInfo = "success"; Calendar calendar = Calendar.getInstance(); calendar.setTime(new Date()); @@ -108,28 +110,28 @@ public class MapEightServiceImpl implements MapEightService { @Override public List listAllHighRiskWorkLocation(PageData pd) throws Exception { - List r = new ArrayList<>(); - String typeStr = pd.getString("TYPE"); - //动火 - if(StringUtils.equals(typeStr,"HOTWORK")){ + List r = new ArrayList<>(); + String typeStr = pd.getString("TYPE"); + //动火 + if(StringUtils.equals(typeStr,"HOTWORK")){ // r = mapEightMapper.getHOTWORKHighRiskWorkLocation(pd); r = mapEightMapper.getHOTWORKHighRiskWorkLocationCfd(pd); - //临时用电 - }else if(StringUtils.equals(typeStr,"ELECTRICITY")){ - r = mapEightMapper.getELECTRICITYHighRiskWorkLocation(pd); - //盲板 - }else if(StringUtils.equals(typeStr,"BLINDBOARD")){ - r = mapEightMapper.getBLINDBOARDHighRiskWorkLocation(pd); - // 高处 - }else if(StringUtils.equals(typeStr,"HIGHWORK")){ - r = mapEightMapper.getHIGHWORKHighRiskWorkLocation(pd); - //有限空间 - }else if(StringUtils.equals(typeStr,"CONFINEDSPACE")){ - r = mapEightMapper.getCONFINEDSPACEHighRiskWorkLocation(pd); - //吊装 - }else if(StringUtils.equals(typeStr,"HOISTING")){ - r = mapEightMapper.getHOISTINGHighRiskWorkLocation(pd); - } + //临时用电 + }else if(StringUtils.equals(typeStr,"ELECTRICITY")){ + r = mapEightMapper.getELECTRICITYHighRiskWorkLocationOrder(pd); + //盲板 + }else if(StringUtils.equals(typeStr,"BLINDBOARD")){ + r = mapEightMapper.getBLINDBOARDHighRiskWorkLocationOrder(pd); + // 高处 + }else if(StringUtils.equals(typeStr,"HIGHWORK")){ + r = mapEightMapper.getHIGHWORKHighRiskWorkLocationOrder(pd); + //有限空间 + }else if(StringUtils.equals(typeStr,"CONFINEDSPACE")){ + r = mapEightMapper.getCONFINEDSPACEHighRiskWorkLocationOrder(pd); + //吊装 + }else if(StringUtils.equals(typeStr,"HOISTING")){ + r = mapEightMapper.getHOISTINGHighRiskWorkLocationOrder(pd); + } return r; } @@ -352,7 +354,7 @@ public class MapEightServiceImpl implements MapEightService { }else if(StringUtils.equals(typeStr,"BLINDBOARD")){ pd.put("BLINDBOARD_ID",idStr); pd = mapEightMapper.findByIdBLINDBOARDOrder(pd); - map.put("measuresList", mapEightMapper.listAllMeasuresBLINDBOARDOrder(pd)); + map.put("measuresList", mapEightMapper.listAllMeasuresBLINDBOARDOrder(pd)); PageData Info = mapEightMapper.findByIdJWDOrder(pd); pd.put("TYPE",105);//盲板位置图 pd.put("FOREIGN_KEY",pd.getString("BLINDBOARD_ID")); @@ -368,12 +370,13 @@ public class MapEightServiceImpl implements MapEightService { map.put("imgList1",mapEightMapper.findByHIGHWORKAcceptuserId(pd)); map.put("imgList",mapEightMapper.findByHIGHWORKAcceptuserIds(pd)); }else if(StringUtils.equals(typeStr,"CONFINEDSPACE")){ - //没有有限空间作业 - //pd.put("CONFINEDSPACE_ID",idStr); - //pd = mapEightMapper.findByIdCONFINEDSPACE(pd); - pd = new PageData(); - map.put("measuresList", null); - map.put("gasList", null); + pd.put("CONFINEDSPACE_ID",idStr); + pd = mapEightMapper.findByIdCONFINEDSPACEOrder(pd); //根据ID读取 + map.put("measuresList", mapEightMapper.listAllMeasuresCONFINEDSPACEOrder(pd)); + map.put("gasList", mapEightMapper.listAllCONFINEDSPACEOrder(pd)); + map.put("gas", mapEightMapper.findByIdCONFINEDSPACEGasWH(pd)); + map.put("imgList",mapEightMapper.findByIdCONFINEDSPACEAcceptusers(pd)); + map.put("imgList1",mapEightMapper.findByIdCONFINEDSPACEAcceptuser(pd)); }else if(StringUtils.equals(typeStr,"HOISTING")){ pd.put("HOISTING_ID",idStr); pd = mapEightMapper.findByIdHOISTINGOrder(pd); @@ -569,18 +572,18 @@ public class MapEightServiceImpl implements MapEightService { } } pd.put("specialUserList", specialUserList); - return pd; + return pd; } - private PageData dianhuo(PageData pd){ - if(StringUtils.isBlank(pd.getString("HOT_WORK_METHOD_NAME"))){ - String zidian = pd.getString("HOT_WORK_METHOD_ID"); - List shuzu = Arrays.asList(zidian.split(",")); + private PageData dianhuo(PageData pd){ + if(StringUtils.isBlank(pd.getString("HOT_WORK_METHOD_NAME"))){ + String zidian = pd.getString("HOT_WORK_METHOD_ID"); + List shuzu = Arrays.asList(zidian.split(",")); List wenzi = mapEightMapper.getListDongHuo(shuzu); String pinjie = String.join(",",wenzi); pd.put("HOT_WORK_METHOD_NAME",pinjie); } - return pd; - } + return pd; + } } diff --git a/src/main/resources/mybatis/datasource/map/MapEightMapper.xml b/src/main/resources/mybatis/datasource/map/MapEightMapper.xml index 4d0f9ebc..fadc2b02 100644 --- a/src/main/resources/mybatis/datasource/map/MapEightMapper.xml +++ b/src/main/resources/mybatis/datasource/map/MapEightMapper.xml @@ -67,24 +67,26 @@ AND CORPINFO_ID IN - #{item} + #{item} GROUP BY STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) UNION ALL + SELECT STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) CREATTIME, - '0' AS cutroadCount, + '0' AS hotworkapplicationCount, count( 1 ) blindboardCount, - '0' breakgroundCount, + '0' confinedspaceCount, '0' highworkCount, '0' hoistingCount, '0' electricityCount FROM - bus_blindboard + gf_blindboard WHERE DATE_SUB( CURDATE(), INTERVAL 4 DAY )<= STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) and ISDELETE = '0' + and APPLY_STATUS != '0' and CORPINFO_ID = #{CORPINFO_ID} @@ -96,19 +98,21 @@ GROUP BY STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) UNION ALL + SELECT STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) CREATTIME, '0' cutroadCount, '0' blindboardCount, - count( 1 ) breakgroundCount, + count( 1 ) confinedspaceCount, '0' highworkCount, '0' hoistingCount, '0' electricityCount FROM - bus_confinedspace + gf_confinedspace WHERE DATE_SUB( CURDATE(), INTERVAL 4 DAY )<= STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) and ISDELETE = '0' + and APPLY_STATUS != '0' and CORPINFO_ID = #{CORPINFO_ID} @@ -120,19 +124,21 @@ GROUP BY STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) UNION ALL + SELECT STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) CREATTIME, - '0' cutroadCount, + '0' hotworkapplicationCount, '0' blindboardCount, - '0' breakgroundCount, + '0' confinedspaceCount, count( 1 ) highworkCount, '0' hoistingCount, '0' electricityCount FROM - bus_highwork + gf_highwork WHERE DATE_SUB( CURDATE(), INTERVAL 4 DAY )<= STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) and ISDELETE = '0' + and APPLY_STATUS != '0' and CORPINFO_ID = #{CORPINFO_ID} @@ -144,19 +150,22 @@ GROUP BY STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) UNION ALL + + SELECT STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) CREATTIME, - '0' cutroadCount, + '0' hotworkapplicationCount, '0' blindboardCount, - '0' breakgroundCount, + '0' confinedspaceCount, '0' highworkCount, count( 1 ) hoistingCount, '0' electricityCount FROM - bus_hoisting + gf_hoisting WHERE DATE_SUB( CURDATE(), INTERVAL 4 DAY )<= STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) and ISDELETE = '0' + and APPLY_STATUS != '0' and CORPINFO_ID = #{CORPINFO_ID} @@ -168,49 +177,53 @@ GROUP BY STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) UNION ALL + + SELECT STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) CREATTIME, - '0' cutroadCount, + '0' hotworkapplicationCount, '0' blindboardCount, - '0' breakgroundCount, + '0' confinedspaceCount, '0' highworkCount, '0' hoistingCount, count( 1 ) electricityCount FROM - bus_electricity + gf_electricity WHERE DATE_SUB( CURDATE(), INTERVAL 4 DAY )<= STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) and ISDELETE = '0' + and APPLY_STATUS != '0' and CORPINFO_ID = #{CORPINFO_ID} - + AND CORPINFO_ID IN - + #{item} GROUP BY STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) + ) s GROUP BY s.CREATTIME ) h ON h.CREATTIME = t.click_date order by t.click_date - + SELECT * FROM - (SELECT + (SELECT f.HOTWORK_ID ID, f.CHECK_NO WORK_NUMBER, '动火作业' WORK_TYPE, @@ -504,31 +409,38 @@ GROUP BY f.HOTWORK_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.electricity_ID ID, - f.CHECK_NO WORK_NUMBER, - '临时用电作业' WORK_TYPE, - case f.APPLY_STATUS - when '0' then '待提交' - when '1' then '待确认' - when '2' then '待审批' - when '3' then '已归档' - when '4' then '已验收' - when '-1' then '已打回' - END STATUS_NAME, - case f.APPLY_STATUS - when '0' then f.APPLY_USER_ID - when '1' then f.ASSURE_USER_ID - when '2' then f.APPROVE_USER_ID - when '3' then f.ACCEPT_USER_ID - when '-1' then f.APPLY_USER_ID - END NEXT_USER_ID, + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.electricity_ID ID, + f.CHECK_NO WORK_NUMBER, + '临时用电作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业负责人待审核' + when '2' then '用电单位待审核' + when '3' then '配送电单位待审核' + when '4' then '待验收' + when '-2' then '已打回' + when '-3' then '已打回' + when '-4' then '已打回' + when '-5' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.APPLY_USER_ID + when '1' then f.CONFIRM_USER_ID + when '2' then f.AUDIT_USER_ID + when '3' then f.APPROVE_USER_ID + when '4' then f.ACCEPT_USER_ID + when '-1' then f.APPLY_USER_ID + when '-2' then f.APPLY_USER_ID + when '-3' then f.APPLY_USER_ID + when '-4' then f.APPLY_USER_ID + when '-5' then f.APPLY_USER_ID + END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM bus_electricity f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS NOT IN ('3','4') - AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') + FROM gf_electricity f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '5' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -538,32 +450,37 @@ #{pd.ids[${index}]} - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.blindboard_ID ID, - f.CHECK_NO WORK_NUMBER, - '盲板作业' WORK_TYPE, - case f.APPLY_STATUS - when '1' then '待确认' - when '2' then '待审批' - when '3' then '已归档' - when '4' then '已打回' - END STATUS_NAME, - case f.APPLY_STATUS - when '1' then bb.OPERATION_UNIT_PERSONCHARGE - when '2' then bb.CORPINFO_APPROVER - when '3' then f.APPLY_USER_ID - when '4' then f.APPLY_USER_ID - END NEXT_USER_ID, + + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.blindboard_ID ID, + f.CHECK_NO WORK_NUMBER, + '盲板作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业负责人待审核' + when '4' then '所在单位待审核' + when '5' then '待验收' + when '-2' then '已打回' + when '-5' then '已打回' + when '-6' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.APPLY_USER_ID + when '1' then f.CONSTRUCTION_USER_ID + when '4' then f.LEADER_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-2' then APPLY_USER_ID + when '-5' then APPLY_USER_ID + when '-6' then APPLY_USER_ID + END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM bus_blindboard f - LEFT JOIN bus_blindboardinfo bb ON bb.BLINDBOARD_ID = f.BLINDBOARD_ID - WHERE f.ISDELETE = '0' AND f.APPLY_STATUS NOT IN ('3','4') - AND date_format(now(),'%Y-%m-%d %H:%i') >= bb.BOARD_INSTALL_TIME AND bb.BOARD_DISASSEMBLE_TIME >= date_format(now(),'%Y-%m-%d %H:%i') + FROM gf_blindboard f + WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '6' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -573,39 +490,44 @@ #{pd.ids[${index}]} - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.HIGHWORK_ID ID, - f.CHECK_NO WORK_NUMBER, - '高处作业' WORK_TYPE, - case f.APPLY_STATUS - when '0' then '待提交' - when '1' then '待确认' - when '2' then '待审核' - when '3' then '待审批' - when '4' then '已归档' - when '5' then '已验收' - when '-2' then '确认打回' - when '-3' then '审核打回' - when '-4' then '审批打回' - when '55' then '待验收' - END STATUS_NAME, - case f.APPLY_STATUS - when '1' then f.CONSTRUCTION_USER_ID - when '2' then f.AUDIT_USER_ID - when '3' then f.APPROVE_USER_ID - when '-2' then f.CREATOR - when '-3' then f.CREATOR - when '-4' then f.CREATOR - when '55' then f.ACCEPT_USER_ID - END NEXT_USER_ID, + + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.HIGHWORK_ID ID, + f.CHECK_NO WORK_NUMBER, + '高处作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业负责人待审核' + when '2' then '所在单位待审核' + when '3' then '审核部门待审核' + when '4' then '审批部门待审核' + when '5' then '待验收' + when '-2' then '已打回' + when '-3' then '已打回' + when '-4' then '已打回' + when '-5' then '已打回' + when '-6' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.CREATOR + when '1' then f.CONSTRUCTION_USER_ID + when '2' then f.LEADER_USER_ID + when '3' then f.AUDIT_USER_ID + when '4' then f.APPROVE_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-2' then f.CREATOR + when '-3' then f.CREATOR + when '-4' then f.CREATOR + when '-5' then f.CREATOR + when '-6' then f.CREATOR + END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM bus_highwork f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS NOT IN ('4','5','55','-5') - AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') + FROM gf_highwork f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -615,44 +537,34 @@ #{pd.ids[${index}]} - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.confinedspace_ID ID, - f.WORK_PERMIT_NUMBER WORK_NUMBER, - '有限空间作业' WORK_TYPE, - case f.APPLY_STATUS - when '1' then '待采样' - when '2' then '作业单位责任人确认' - when '3' then '作业现场责任人审核' - when '4' then '管理单位责任人审批' - when '5' then '作业单位责任人验收' - when '6' then '管理单位责任人验收' - when '-2' then '作业单位责任人确认打回' - when '-3' then '作业现场责任人审核打回' - when '-4' then '管理单位责任人审批打回' - when '-5' then '作业单位责任人验收打回' - when '-6' then '管理单位责任人验收打回' - END STATUS_NAME, - case f.APPLY_STATUS - when '1' then f.SAMPLING_ANALYST_ID - when '2' then f.WORK_UNIT_MANAGER_ID - when '3' then f.JOB_SITE_MANAGER_ID - when '4' then f.MANAGEMENT_UNIT_ID - when '5' then f.WORK_UNIT_MANAGER_ID - when '6' then f.MANAGEMENT_UNIT_ID - when '-2' then f.CREATOR - when '-3' then f.CREATOR - when '-4' then f.CREATOR - when '-5' then f.CREATOR - when '-6' then f.CREATOR - END NEXT_USER_ID, + + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.confinedspace_ID ID, + f.CHECK_NO WORK_NUMBER, + '有限空间作业' WORK_TYPE, + case f.APPLY_STATUS + when '1' then '作业负责人待审核' + when '4' then '所在单位待审核' + when '5' then '待验收' + when '-4' then '作业负责人审核打回' + when '-5' then '所在单位审核打回' + when '-6' then '验收打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '1' then f.CONFIRM_USER_ID + when '4' then f.APPROVE_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-4' then f.CREATOR + when '-5' then f.CREATOR + when '-6' then f.CREATOR + END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM bus_confinedspace f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '7' - AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') + FROM gf_confinedspace f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '6' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -662,40 +574,44 @@ #{pd.ids[${index}]} - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.hoisting_ID ID, - f.NUMBERING WORK_NUMBER, - '吊装作业' WORK_TYPE, - case f.APPLY_STATUS - when '0' then '待提交' - when '1' then '待确认' - when '2' then '待审核' - when '3' then '待审批' - when '4' then '已归档' - when '5' then '已验收' - when '-2' then '确认打回' - when '-3' then '审核打回' - when '-4' then '审批打回' - when '55' then '待验收' - END STATUS_NAME, - case f.APPLY_STATUS - when '1' then f.CONSTRUCTION_JOB_MANAGER_ID - when '2' then f.WORK_UNIT_MANAGER_ID - when '3' then f.BRANCH_APPROVER_ID - when '-2' then f.CREATOR - when '-3' then f.CREATOR - when '-4' then f.CREATOR - when '55' then f.ACCEPTOR_ID - END NEXT_USER_ID, + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.hoisting_ID ID, + f.CHECK_NO WORK_NUMBER, + '吊装作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业指挥待审核' + when '2' then '所在单位待审核' + when '3' then '审核部门待审核' + when '4' then '审批部门待审核' + when '5' then '待验收' + when '-2' then '已打回' + when '-3' then '已打回' + when '-4' then '已打回' + when '-5' then '已打回' + when '-6' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.CREATOR + when '1' then f.LEADER_USER_ID + when '2' then f.CONSTRUCTION_USER_ID + when '3' then f.AUDIT_USER_ID + when '4' then f.APPROVE_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-2' then f.CREATOR + when '-3' then f.CREATOR + when '-4' then f.CREATOR + when '-5' then f.CREATOR + when '-6' then f.CREATOR + END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM bus_hoisting f - WHERE f.ISDELETE = '0' AND f.APPLY_STATUS NOT IN ('4','5','55','-5') - AND date_format(now(),'%Y-%m-%d %H:%i') >= f.JOB_START_TIME AND f.JOB_END_TIME >= date_format(now(),'%Y-%m-%d %H:%i') + FROM gf_hoisting f + WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -705,9 +621,9 @@ #{pd.ids[${index}]} - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - ) f + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + ) f ORDER BY f.OPERATTIME DESC @@ -715,17 +631,17 @@ SELECT - 'ELECTRICITY' TYPE, - f.ELECTRICITY_ID id, - CONCAT_WS("", '临时用电作业 编号：', f.CHECK_NO) NAME, - f.WORK_LONGITUDE LONGITUDE, - f.WORK_LATITUDE LATITUDE, - './bi/images/map/electricity.png' IMAGE_FILE, + 'ELECTRICITY' TYPE, + f.ELECTRICITY_ID id, + CONCAT_WS("", '临时用电作业 编号：', f.CHECK_NO) NAME, + f.WORK_LONGITUDE LONGITUDE, + f.WORK_LATITUDE LATITUDE, + './bi/images/map/electricity.png' IMAGE_FILE, f.CORPINFO_ID, f.CHECK_NO as MAP_POINT_NAME FROM bus_electricity f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL - AND f.APPLY_STATUS NOT IN ('3','4') - AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') + AND f.APPLY_STATUS NOT IN ('3','4') + AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') and f.CORPINFO_ID = #{CORPINFO_ID} @@ -764,7 +680,7 @@ SELECT - 'HIGHWORK' TYPE, - f.HIGHWORK_ID id, - CONCAT_WS("", '高处作业 编号：', f.CHECK_NO) NAME, - f.WORK_LONGITUDE LONGITUDE, - f.WORK_LATITUDE LATITUDE, - './bi/images/map/highwork.png' IMAGE_FILE, - f.CORPINFO_ID, - f.CHECK_NO as MAP_POINT_NAME - FROM bus_highwork f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL - AND f.APPLY_STATUS NOT IN ('4','5','55','-5') - AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') + 'HIGHWORK' TYPE, + f.HIGHWORK_ID id, + CONCAT_WS("", '高处作业 编号：', f.CHECK_NO) NAME, + f.WORK_LONGITUDE LONGITUDE, + f.WORK_LATITUDE LATITUDE, + './bi/images/map/highwork.png' IMAGE_FILE, + f.CORPINFO_ID, + f.CHECK_NO as MAP_POINT_NAME + FROM bus_highwork f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL + AND f.APPLY_STATUS NOT IN ('4','5','55','-5') + AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') and f.CORPINFO_ID = #{CORPINFO_ID} @@ -814,57 +730,6 @@ - - - - - - - SELECT * FROM - (SELECT - f.HOTWORKAPPLICATION_ID ID, - f.JOB_NUMBER WORK_NUMBER, - '动火作业' WORK_TYPE, - case f.STATE - when 1 then '动火单位负责人确认' - when 2 then '项目发包单位签发' - when 3 then '现场管辖单位负责人' - when 4 then '动火许可签发单位' - when 5 then '安全总监审批' - when 6 then '现场负责人' - when 7 then '动火前' - when 8 then '现场负责人确认' - when 9 then '动火后' - when 10 then '延时监火' - when 11 then '归档' - when 21 then '动火操作人' - when 22 then '监护人' - when 24 then '气体检测人' - when -1 then '审核不通过' - when -2 then '特级动火不通过' - when -3 then '未完成 关闭归档' - when -4 then '延期' - when -5 then '已打回' - when -6 then '超期' - when 30 then '动火负责人确认' - when 31 then '项目主管初审' - when 32 then '项目监管部门负责人' - when 33 then '分公司安全总监审批' - when 34 then '分公司主要负责人' - when 35 then '安全监督部初审' - when 36 then '安委会办公室' - when 37 then '安全总监审批' - END STATUS_NAME, - IF(f.STATE = 10,IFNULL(od.`NAME`,IFNULL(GROUP_CONCAT(REPLACE(u.NAME,'/',',')),IFNULL(qu.`NAME`,''))),IFNULL(GROUP_CONCAT(REPLACE(u.NAME,'/',',')),IFNULL(qu.`NAME`,''))) USER_NAME, - - DATE_FORMAT(ifnull(f.OPERATTIME,f.CREATTIME),'%Y-%m-%d %H:%i:%s') OPERATTIME - FROM bus_hotworkapplication f - LEFT JOIN bus_hotworkapplicationuser hu ON hu.FOREIGN_KEY = f.HOTWORKAPPLICATION_ID AND hu.STATE = f.STATE - LEFT JOIN sys_user u ON u.USER_ID = hu.USER_ID - LEFT JOIN oa_department od ON od.DEPARTMENT_ID = hu.USER_ID - LEFT JOIN `qa-gwj-regulatory`.sys_user qu on qu.USER_ID = hu.USER_ID - WHERE f.ISDELETE = '0' AND f.STATE >= 0 and f.STATE != 11 + (SELECT + f.HOTWORKAPPLICATION_ID ID, + f.JOB_NUMBER WORK_NUMBER, + '动火作业' WORK_TYPE, + case f.STATE + when 1 then '动火单位负责人确认' + when 2 then '项目发包单位签发' + when 3 then '现场管辖单位负责人' + when 4 then '动火许可签发单位' + when 5 then '安全总监审批' + when 6 then '现场负责人' + when 7 then '动火前' + when 8 then '现场负责人确认' + when 9 then '动火后' + when 10 then '延时监火' + when 11 then '归档' + when 21 then '动火操作人' + when 22 then '监护人' + when 24 then '气体检测人' + when -1 then '审核不通过' + when -2 then '特级动火不通过' + when -3 then '未完成 关闭归档' + when -4 then '延期' + when -5 then '已打回' + when -6 then '超期' + when 30 then '动火负责人确认' + when 31 then '项目主管初审' + when 32 then '项目监管部门负责人' + when 33 then '分公司安全总监审批' + when 34 then '分公司主要负责人' + when 35 then '安全监督部初审' + when 36 then '安委会办公室' + when 37 then '安全总监审批' + END STATUS_NAME, + IF(f.STATE = 10,IFNULL(od.`NAME`,IFNULL(GROUP_CONCAT(REPLACE(u.NAME,'/',',')),IFNULL(qu.`NAME`,''))),IFNULL(GROUP_CONCAT(REPLACE(u.NAME,'/',',')),IFNULL(qu.`NAME`,''))) USER_NAME, + + DATE_FORMAT(ifnull(f.OPERATTIME,f.CREATTIME),'%Y-%m-%d %H:%i:%s') OPERATTIME + FROM bus_hotworkapplication f + LEFT JOIN bus_hotworkapplicationuser hu ON hu.FOREIGN_KEY = f.HOTWORKAPPLICATION_ID AND hu.STATE = f.STATE + LEFT JOIN sys_user u ON u.USER_ID = hu.USER_ID + LEFT JOIN oa_department od ON od.DEPARTMENT_ID = hu.USER_ID + LEFT JOIN `qa-gwj-regulatory`.sys_user qu on qu.USER_ID = hu.USER_ID + WHERE f.ISDELETE = '0' AND f.STATE >= 0 and f.STATE != 11 and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -2126,165 +1972,118 @@ - GROUP BY f.HOTWORKAPPLICATION_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.electricity_ID ID, - f.CHECK_NO WORK_NUMBER, - '临时用电作业' WORK_TYPE, - case f.APPLY_STATUS - when '0' then '待提交' - when '1' then '作业负责人待审核' - when '2' then '用电单位待审核' - when '3' then '配送电单位待审核' - when '4' then '待验收' - when '-2' then '已打回' - when '-3' then '已打回' - when '-4' then '已打回' - when '-5' then '已打回' - END STATUS_NAME, - case f.APPLY_STATUS - when '0' then f.APPLY_USER_ID - when '1' then f.CONFIRM_USER_ID - when '2' then f.AUDIT_USER_ID - when '3' then f.APPROVE_USER_ID - when '4' then f.ACCEPT_USER_ID - when '-1' then f.APPLY_USER_ID - when '-2' then f.APPLY_USER_ID - when '-3' then f.APPLY_USER_ID - when '-4' then f.APPLY_USER_ID - when '-5' then f.APPLY_USER_ID - END NEXT_USER_ID, - ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM gf_electricity f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '5' - - and f.CORPINFO_ID = #{pd.CORPINFO_ID} - - - AND f.CORPINFO_ID IN - - #{pd.ids[${index}]} - - - - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.blindboard_ID ID, - f.CHECK_NO WORK_NUMBER, - '盲板作业' WORK_TYPE, - case f.APPLY_STATUS - when '0' then '待提交' - when '1' then '作业负责人待审核' - when '4' then '所在单位待审核' - when '5' then '待验收' - when '-2' then '已打回' - when '-5' then '已打回' - when '-6' then '已打回' - END STATUS_NAME, - case f.APPLY_STATUS - when '0' then f.APPLY_USER_ID - when '1' then f.CONSTRUCTION_USER_ID - when '4' then f.LEADER_USER_ID - when '5' then f.ACCEPT_USER_ID - when '-2' then APPLY_USER_ID - when '-5' then APPLY_USER_ID - when '-6' then APPLY_USER_ID - END NEXT_USER_ID, - ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM gf_blindboard f - WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '6' - - and f.CORPINFO_ID = #{pd.CORPINFO_ID} - - - AND f.CORPINFO_ID IN - - #{pd.ids[${index}]} - - - - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.HIGHWORK_ID ID, - f.CHECK_NO WORK_NUMBER, - '高处作业' WORK_TYPE, - case f.APPLY_STATUS - when '0' then '待提交' - when '1' then '作业负责人待审核' - when '2' then '所在单位待审核' - when '3' then '审核部门待审核' - when '4' then '审批部门待审核' - when '5' then '待验收' - when '-2' then '已打回' - when '-3' then '已打回' - when '-4' then '已打回' - when '-5' then '已打回' - when '-6' then '已打回' - END STATUS_NAME, - case f.APPLY_STATUS - when '0' then f.CREATOR - when '1' then f.CONSTRUCTION_USER_ID - when '2' then f.LEADER_USER_ID - when '3' then f.AUDIT_USER_ID - when '4' then f.APPROVE_USER_ID - when '5' then f.ACCEPT_USER_ID - when '-2' then f.CREATOR - when '-3' then f.CREATOR - when '-4' then f.CREATOR - when '-5' then f.CREATOR - when '-6' then f.CREATOR - END NEXT_USER_ID, - ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM gf_highwork f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' - - and f.CORPINFO_ID = #{pd.CORPINFO_ID} - - - AND f.CORPINFO_ID IN - - #{pd.ids[${index}]} - - - - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL + GROUP BY f.HOTWORKAPPLICATION_ID + UNION ALL SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME FROM (SELECT - f.confinedspace_ID ID, - f.WORK_PERMIT_NUMBER WORK_NUMBER, - '有限空间作业' WORK_TYPE, + f.electricity_ID ID, + f.CHECK_NO WORK_NUMBER, + '临时用电作业' WORK_TYPE, case f.APPLY_STATUS - when '1' then '待采样' - when '2' then '作业单位责任人确认' - when '3' then '作业现场责任人审核' - when '4' then '管理单位责任人审批' - when '5' then '作业单位责任人验收' - when '6' then '管理单位责任人验收' - when '-2' then '作业单位责任人确认打回' - when '-3' then '作业现场责任人审核打回' - when '-4' then '管理单位责任人审批打回' - when '-5' then '作业单位责任人验收打回' - when '-6' then '管理单位责任人验收打回' + when '0' then '待提交' + when '1' then '作业负责人待审核' + when '2' then '用电单位待审核' + when '3' then '配送电单位待审核' + when '4' then '待验收' + when '-2' then '已打回' + when '-3' then '已打回' + when '-4' then '已打回' + when '-5' then '已打回' END STATUS_NAME, case f.APPLY_STATUS - when '1' then f.SAMPLING_ANALYST_ID - when '2' then f.WORK_UNIT_MANAGER_ID - when '3' then f.JOB_SITE_MANAGER_ID - when '4' then f.MANAGEMENT_UNIT_ID - when '5' then f.WORK_UNIT_MANAGER_ID - when '6' then f.MANAGEMENT_UNIT_ID + when '0' then f.APPLY_USER_ID + when '1' then f.CONFIRM_USER_ID + when '2' then f.AUDIT_USER_ID + when '3' then f.APPROVE_USER_ID + when '4' then f.ACCEPT_USER_ID + when '-1' then f.APPLY_USER_ID + when '-2' then f.APPLY_USER_ID + when '-3' then f.APPLY_USER_ID + when '-4' then f.APPLY_USER_ID + when '-5' then f.APPLY_USER_ID + END NEXT_USER_ID, + ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME + FROM gf_electricity f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '5' + + and f.CORPINFO_ID = #{pd.CORPINFO_ID} + + + AND f.CORPINFO_ID IN + + #{pd.ids[${index}]} + + + + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.blindboard_ID ID, + f.CHECK_NO WORK_NUMBER, + '盲板作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业负责人待审核' + when '4' then '所在单位待审核' + when '5' then '待验收' + when '-2' then '已打回' + when '-5' then '已打回' + when '-6' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.APPLY_USER_ID + when '1' then f.CONSTRUCTION_USER_ID + when '4' then f.LEADER_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-2' then APPLY_USER_ID + when '-5' then APPLY_USER_ID + when '-6' then APPLY_USER_ID + END NEXT_USER_ID, + ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME + FROM gf_blindboard f + WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '6' + + and f.CORPINFO_ID = #{pd.CORPINFO_ID} + + + AND f.CORPINFO_ID IN + + #{pd.ids[${index}]} + + + + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.HIGHWORK_ID ID, + f.CHECK_NO WORK_NUMBER, + '高处作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业负责人待审核' + when '2' then '所在单位待审核' + when '3' then '审核部门待审核' + when '4' then '审批部门待审核' + when '5' then '待验收' + when '-2' then '已打回' + when '-3' then '已打回' + when '-4' then '已打回' + when '-5' then '已打回' + when '-6' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.CREATOR + when '1' then f.CONSTRUCTION_USER_ID + when '2' then f.LEADER_USER_ID + when '3' then f.AUDIT_USER_ID + when '4' then f.APPROVE_USER_ID + when '5' then f.ACCEPT_USER_ID when '-2' then f.CREATOR when '-3' then f.CREATOR when '-4' then f.CREATOR @@ -2292,8 +2091,44 @@ when '-6' then f.CREATOR END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM bus_confinedspace f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '7' - AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') + FROM gf_highwork f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' + + and f.CORPINFO_ID = #{pd.CORPINFO_ID} + + + AND f.CORPINFO_ID IN + + #{pd.ids[${index}]} + + + + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.confinedspace_ID ID, + f.CHECK_NO WORK_NUMBER, + '有限空间作业' WORK_TYPE, + case f.APPLY_STATUS + when '1' then '作业负责人待审核' + when '4' then '所在单位待审核' + when '5' then '待验收' + when '-4' then '作业负责人审核打回' + when '-5' then '所在单位审核打回' + when '-6' then '验收打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '1' then f.CONFIRM_USER_ID + when '4' then f.APPROVE_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-4' then f.CREATOR + when '-5' then f.CREATOR + when '-6' then f.CREATOR + END NEXT_USER_ID, + ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME + FROM gf_confinedspace f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '6' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -2305,42 +2140,42 @@ ) f LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.hoisting_ID ID, - f.CHECK_NO WORK_NUMBER, - '吊装作业' WORK_TYPE, - case f.APPLY_STATUS - when '0' then '待提交' - when '1' then '作业指挥待审核' - when '2' then '所在单位待审核' - when '3' then '审核部门待审核' - when '4' then '审批部门待审核' - when '5' then '待验收' - when '-2' then '已打回' - when '-3' then '已打回' - when '-4' then '已打回' - when '-5' then '已打回' - when '-6' then '已打回' - END STATUS_NAME, - case f.APPLY_STATUS - when '0' then f.CREATOR - when '1' then f.LEADER_USER_ID - when '2' then f.CONSTRUCTION_USER_ID - when '3' then f.AUDIT_USER_ID - when '4' then f.APPROVE_USER_ID - when '5' then f.ACCEPT_USER_ID - when '-2' then f.CREATOR - when '-3' then f.CREATOR - when '-4' then f.CREATOR - when '-5' then f.CREATOR - when '-6' then f.CREATOR - END NEXT_USER_ID, + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.hoisting_ID ID, + f.CHECK_NO WORK_NUMBER, + '吊装作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业指挥待审核' + when '2' then '所在单位待审核' + when '3' then '审核部门待审核' + when '4' then '审批部门待审核' + when '5' then '待验收' + when '-2' then '已打回' + when '-3' then '已打回' + when '-4' then '已打回' + when '-5' then '已打回' + when '-6' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.CREATOR + when '1' then f.LEADER_USER_ID + when '2' then f.CONSTRUCTION_USER_ID + when '3' then f.AUDIT_USER_ID + when '4' then f.APPROVE_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-2' then f.CREATOR + when '-3' then f.CREATOR + when '-4' then f.CREATOR + when '-5' then f.CREATOR + when '-6' then f.CREATOR + END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM gf_hoisting f - WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' + FROM gf_hoisting f + WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -2351,45 +2186,45 @@ - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.BREAKGROUND_ID ID, - f.CHECK_NO WORK_NUMBER, - '动土作业' WORK_TYPE, - case f.APPLY_STATUS - when '0' then '待提交' - when '1' then '作业负责人待审核' - when '2' then '所在单位待审核' - when '3' then '有关部门待审核' - when '4' then '审批部门待审核' - when '5' then '待验收' - when '-2' then '已打回' - when '-3' then '已打回' - when '-4' then '已打回' - when '-5' then '已打回' - when '-6' then '已打回' - END STATUS_NAME, - case f.APPLY_STATUS - when '0' then f.CREATOR - when '1' then f.CONSTRUCTION_USER_ID - when '2' then f.PRODUCTION_USER_ID - when '3' then f.SAFETY_USER_ID - when '4' then f.LEADER_USER_ID - when '5' then f.ACCEPT_USER_ID - when '-2' then f.CREATOR - when '-3' then f.CREATOR - when '-4' then f.CREATOR - when '-5' then f.CREATOR - when '-6' then f.CREATOR - END NEXT_USER_ID, + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.BREAKGROUND_ID ID, + f.CHECK_NO WORK_NUMBER, + '动土作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业负责人待审核' + when '2' then '所在单位待审核' + when '3' then '有关部门待审核' + when '4' then '审批部门待审核' + when '5' then '待验收' + when '-2' then '已打回' + when '-3' then '已打回' + when '-4' then '已打回' + when '-5' then '已打回' + when '-6' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.CREATOR + when '1' then f.CONSTRUCTION_USER_ID + when '2' then f.PRODUCTION_USER_ID + when '3' then f.SAFETY_USER_ID + when '4' then f.LEADER_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-2' then f.CREATOR + when '-3' then f.CREATOR + when '-4' then f.CREATOR + when '-5' then f.CREATOR + when '-6' then f.CREATOR + END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM gf_breakground f - WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' + FROM gf_breakground f + WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -2400,45 +2235,45 @@ - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.CUTROAD_ID ID, - f.CHECK_NO WORK_NUMBER, - '断路作业' WORK_TYPE, - case f.APPLY_STATUS - when '0' then '待提交' - when '1' then '作业负责人待审核' - when '2' then '所在单位待审核' - when '3' then '消防、安全管理部门待审核' - when '4' then '审批部门待审核' - when '5' then '待验收' - when '-2' then '已打回' - when '-3' then '已打回' - when '-4' then '已打回' - when '-5' then '已打回' - when '-6' then '已打回' - END STATUS_NAME, - case f.APPLY_STATUS - when '0' then f.CREATOR - when '1' then f.CONSTRUCTION_USER_ID - when '2' then f.PRODUCTION_USER_ID - when '3' then f.SAFETY_USER_ID - when '4' then f.LEADER_USER_ID - when '5' then f.ACCEPT_USER_ID - when '-2' then f.CREATOR - when '-3' then f.CREATOR - when '-4' then f.CREATOR - when '-5' then f.CREATOR - when '-6' then f.CREATOR - END NEXT_USER_ID, + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.CUTROAD_ID ID, + f.CHECK_NO WORK_NUMBER, + '断路作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业负责人待审核' + when '2' then '所在单位待审核' + when '3' then '消防、安全管理部门待审核' + when '4' then '审批部门待审核' + when '5' then '待验收' + when '-2' then '已打回' + when '-3' then '已打回' + when '-4' then '已打回' + when '-5' then '已打回' + when '-6' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.CREATOR + when '1' then f.CONSTRUCTION_USER_ID + when '2' then f.PRODUCTION_USER_ID + when '3' then f.SAFETY_USER_ID + when '4' then f.LEADER_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-2' then f.CREATOR + when '-3' then f.CREATOR + when '-4' then f.CREATOR + when '-5' then f.CREATOR + when '-6' then f.CREATOR + END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM gf_cutroad f - WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' + FROM gf_cutroad f + WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -2449,9 +2284,9 @@ - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - ) f + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + ) f ORDER BY f.OPERATTIME DESC @@ -2479,9 +2314,9 @@ - + select - `NAME` + `NAME` from - sys_dictionaries + sys_dictionaries where - DICTIONARIES_ID in + DICTIONARIES_ID in #{item} @@ -3704,4 +3538,228 @@ f.HOISTING_ID = #{HOISTING_ID} and f.CORPINFO_ID = #{CORPINFO_ID} and f.ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID} order by f.ACCEPT_CONFESS_USER_SIGNER_TIME asc + + + + + + + + + + + + + + From c40de96242d726fa19700663ebcf9a32aefb1ab4 Mon Sep 17 00:00:00 2001 From: limingyu Date: Wed, 31 Jan 2024 10:24:46 +0800 Subject: [PATCH 47/64] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug12702=E3=80=8113770?= =?UTF-8?q?=E3=80=8113714=E3=80=8113580=E3=80=8112922=E3=80=8112994?= =?UTF-8?q?=E3=80=8113119=E3=80=8113407?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/AppUsersController.java | 19 ++++++ .../app/highriskwork/AppHomeController.java | 4 +- .../AppHotWorkApplicationController.java | 6 +- .../controller/bus/CorpInfoController.java | 1 + .../bus/IdentificationPartsController.java | 7 +++ .../controller/bus/RiskUnitController.java | 2 +- .../firemanager/FireDeviceController.java | 54 ++++++++++++++++++ .../hiddenApi/HiddenApiController.java | 9 +++ .../datasource/bus/NoticeCorpUserMapper.java | 22 ++++--- .../firemanager/FireDeviceMapper.java | 2 + .../mapper/datasource/system/UsersMapper.java | 2 + .../zcloud/service/bus/NoticeCorpService.java | 7 +++ .../service/bus/NoticeCorpUserService.java | 23 +++++--- .../service/bus/impl/CorpInfoServiceImpl.java | 7 ++- .../bus/impl/NoticeCorpServiceImpl.java | 52 +++++++++++++++++ .../bus/impl/NoticeCorpUserServiceImpl.java | 23 +++++--- .../firemanager/FireDeviceService.java | 2 + .../impl/FireDeviceServiceImpl.java | 5 ++ .../zcloud/service/system/UsersService.java | 2 + .../service/system/impl/UsersServiceImpl.java | 5 ++ .../mybatis/datasource/bus/CorpInfoMapper.xml | 1 + .../datasource/bus/NoticeCorpUserMapper.xml | 13 ++++- .../firemanager/FireDeviceMapper.xml | 52 +++++++++++++++++ .../datasource/hiddenApi/HiddenApiMapper.xml | 7 ++- .../keyProjects/KeyprojectHiddenMapper.xml | 3 + .../mybatis/datasource/system/UsersMapper.xml | 6 ++ .../uploadFiles/file/userExcelTemplate2.xls | Bin 137216 -> 21504 bytes 27 files changed, 304 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/zcloud/controller/app/AppUsersController.java b/src/main/java/com/zcloud/controller/app/AppUsersController.java index 97c26102..33e70397 100644 --- a/src/main/java/com/zcloud/controller/app/AppUsersController.java +++ b/src/main/java/com/zcloud/controller/app/AppUsersController.java @@ -7,6 +7,7 @@ import java.util.Map; import com.zcloud.service.system.*; import com.zcloud.util.*; +import org.apache.commons.lang.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.DisabledAccountException; @@ -397,4 +398,22 @@ public class AppUsersController extends BaseController { map.put("result", errInfo); return map; } + + //根据用户id查询部门 + @RequestMapping(value="/getDepartmentByUserId") + @ResponseBody + public Object getDepartmentByUserId()throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData data = usersService.findById(pd); + if (data == null || StringUtils.equals(data.getString("DEPARTMENT_ID"),"")) { + map.put("result", errInfo); + return map; + } + map.put("data", data); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHomeController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHomeController.java index b5484661..1ff1699c 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHomeController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHomeController.java @@ -34,6 +34,8 @@ public class AppHomeController extends BaseController { @Resource private GFBreakGroundService GFbreakGroundService; + @Resource + private GFConfinedSpaceService GFconfinedspaceService; @Autowired private ConfinedSpaceService confinedspaceService; @@ -77,7 +79,7 @@ public class AppHomeController extends BaseController { pd = this.getPageData(); PageData blindboardCount = GFblindboardService.countCheck(pd);// 待办盲板作业数统计 PageData breakGroundCount = GFbreakGroundService.countCheck(pd);// 待办动土作业数统计 - PageData confinedspaceCount = confinedspaceService.countCheck(pd);// 待办有限空间作业数统计 + PageData confinedspaceCount = GFconfinedspaceService.countCheck(pd);// 待办有限空间作业数统计 PageData electricityCount = GFelectricityService.countCheck(pd);// 待办临时用电作业数统计 PageData highworkCount = GFhighworkService.countCheck(pd);// 待办高处作业数统计 PageData hoistingCount = GFhoistingService.countCheck(pd);// 待办吊装作业数统计 diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java index f696040b..94ed8b8e 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java @@ -14,6 +14,7 @@ import com.zcloud.service.highriskwork.HotWorkSafetyMethodRecordService; import com.zcloud.service.highriskwork.HotworkToMeasuresService; import com.zcloud.service.system.DictionariesService; import com.zcloud.service.system.FHlogService; +import com.zcloud.service.system.UsersService; import com.zcloud.util.*; import com.zcloud.util.message.MessageService; import org.apache.commons.io.FileUtils; @@ -86,6 +87,8 @@ public class AppHotWorkApplicationController extends BaseController { * */ @Autowired + private UsersService usersService; + @Autowired private HotWorkApplicationService hotworkapplicationService; @Autowired private HotWorkApplicationUserService hotWorkApplicationUserService; @@ -1753,7 +1756,8 @@ public class AppHotWorkApplicationController extends BaseController { content.put("params2", "延时监火"); content.put("params3", "处理");// 作业操作 mes.put("CONTENT", content);// 站内信内容 - noticeCorpService.sendNotice(mes); + noticeCorpService.sendNoticeToDep(mes); //向部门中的所有人员发通知 +// noticeCorpService.sendNotice(mes); } else if(hot.getString("STATE").equals("30")){ PageData hotUser = hotUserList.get(0); String userID = hotUser.getString("USER_ID"); diff --git a/src/main/java/com/zcloud/controller/bus/CorpInfoController.java b/src/main/java/com/zcloud/controller/bus/CorpInfoController.java index 1308325e..0a0a35e0 100644 --- a/src/main/java/com/zcloud/controller/bus/CorpInfoController.java +++ b/src/main/java/com/zcloud/controller/bus/CorpInfoController.java @@ -274,6 +274,7 @@ public class CorpInfoController extends BaseController { pd2.put("TYPE",2); List fourImgs = imgfilesService.listAll(pd2);//四色图照图片 pd.put("INDUSTRYALL", CORP_TYPEALL); + pd.put("FOURTYPE", "1"); map.put("pd", pd); map.put("pdrelated",pdrelated); map.put("busImgs", busImgs); diff --git a/src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java b/src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java index 63b3648d..668e1c79 100644 --- a/src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java +++ b/src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java @@ -156,6 +156,13 @@ public class IdentificationPartsController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); + List byName = identificationpartsService.findByName(pd); + if (byName != null && byName.size() > 0) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "辨识部位已存在，请修改后重试"); + return map; + } pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 identificationpartsService.edit(pd); diff --git a/src/main/java/com/zcloud/controller/bus/RiskUnitController.java b/src/main/java/com/zcloud/controller/bus/RiskUnitController.java index 65740013..611c6aa5 100644 --- a/src/main/java/com/zcloud/controller/bus/RiskUnitController.java +++ b/src/main/java/com/zcloud/controller/bus/RiskUnitController.java @@ -75,7 +75,7 @@ public class RiskUnitController extends BaseController { //pd.put("DEPARTMENT_ID",Jurisdiction.getDEPARTMENT_ID()); List list = riskunitService.listAll(pd); if(list!=null&&list.size()>0) { - map.put("result", "failed"); + map.put("result", "fail"); map.put("exception", "风险点（单元）已存在，请修改后重试"); return map; } diff --git a/src/main/java/com/zcloud/controller/firemanager/FireDeviceController.java b/src/main/java/com/zcloud/controller/firemanager/FireDeviceController.java index 91059b1f..634a357f 100644 --- a/src/main/java/com/zcloud/controller/firemanager/FireDeviceController.java +++ b/src/main/java/com/zcloud/controller/firemanager/FireDeviceController.java @@ -23,6 +23,7 @@ import com.zcloud.entity.PageData; import com.zcloud.service.firemanager.FireDeviceService; import com.zcloud.util.*; import com.zcloud.util.logAop.LogOperation; +import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -389,4 +390,57 @@ public class FireDeviceController extends BaseController { map.put("result", errInfo); return map; } + + /** + * 导出数据到excel + * @return + * @throws Exception + */ + @RequestMapping(value = "/excelAll") + public ModelAndView excelAll() throws Exception { + ModelAndView mv = new ModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); +// String paramJson = pd.getString("param"); +// Map param = (Map) JSON.parse(paramJson); +// pd.putAll(param); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + List varList = fireDeviceService.exportDataList(pd); + List exportList = new ArrayList<>(); //导出的数据列表 + Map dataMap = new HashMap(); + List titles = new ArrayList(); + titles.add("消防区域编码"); + titles.add("消防点位名称"); + titles.add("消防点位编码"); + titles.add("负责部门"); + titles.add("负责人手机号"); + titles.add("消防器材类型"); + titles.add("消防器材编码"); + titles.add("有效期开始"); + titles.add("结束时间"); + titles.add("存放地点"); + titles.add("负责人"); + dataMap.put("titles", titles); + for (int i = 0; i < varList.size(); i++) { + PageData vpd = new PageData(); + vpd.put("var1", varList.get(i).getString("FIRE_REGION_CODE")); //消防区域编码 + vpd.put("var2", varList.get(i).getString("FIRE_POINT_NAME")); //消防点位名称 + vpd.put("var3", varList.get(i).getString("FIRE_POINT_CODE")); //消防点位编码 + vpd.put("var4", varList.get(i).getString("DEPARTMENTNAME")); //负责部门 + vpd.put("var5", varList.get(i).getString("USER_PHONE")); //负责人手机号 + vpd.put("var6", varList.get(i).getString("FIRE_DEVICE_TYPE_NAME")); //消防器材类型 + vpd.put("var7", varList.get(i).getString("FIRE_DEVICE_CODE")); //消防器材编码 + vpd.put("var8", varList.get(i).getString("VALIDITY_START_TIME")); //有效期开始 + vpd.put("var9", varList.get(i).getString("VALIDITY_END_TIME"));//结束时间 + vpd.put("var10", varList.get(i).getString("REMAKE"));//存放地点 + vpd.put("var11", varList.get(i).getString("USERNAME"));//负责人 + exportList.add(vpd); + } + dataMap.put("varList", exportList); + ObjectExcelView erv = new ObjectExcelView(); + mv = new ModelAndView(erv, dataMap); + return mv; + } } diff --git a/src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java b/src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java index ff394201..5bd872b4 100644 --- a/src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java +++ b/src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java @@ -821,6 +821,15 @@ public class HiddenApiController extends BaseController { if ("list".equals(pd.getString("hiddenVueType"))) { // 整改隐患 pd = Jurisdiction.getUserDataJurisdiction(pd); } + List hiddenTypeList = new ArrayList<>(); + for (Object key : pd.keySet()) { + if (key.toString().contains("hiddenType[")) { + hiddenTypeList.add(pd.getString(key.toString())); + } + } + if (hiddenTypeList.size() > 0) { + pd.put("hiddenTypeList", hiddenTypeList); + } /*上方的条件选择都是 condform */ /** diff --git a/src/main/java/com/zcloud/mapper/datasource/bus/NoticeCorpUserMapper.java b/src/main/java/com/zcloud/mapper/datasource/bus/NoticeCorpUserMapper.java index 94c210df..5859d6ee 100644 --- a/src/main/java/com/zcloud/mapper/datasource/bus/NoticeCorpUserMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/bus/NoticeCorpUserMapper.java @@ -4,7 +4,7 @@ import java.util.List; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -/** +/** * 说明：企业公告人员关系表 * 作者：luoxiaobao * 时间：2021-01-22 @@ -17,37 +17,37 @@ public interface NoticeCorpUserMapper{ * @throws Exception */ void save(PageData pd); - + /**删除 * @param pd * @throws Exception */ void delete(PageData pd); - + /**修改 * @param pd * @throws Exception */ void edit(PageData pd); - + /**列表 * @param page * @throws Exception */ List datalistPage(Page page); - + /**列表(全部) * @param pd * @throws Exception */ List listAll(PageData pd); - + /**通过id获取数据 * @param pd * @throws Exception */ PageData findById(PageData pd); - + /**批量删除 * @param ArrayDATA_IDS * @throws Exception @@ -58,7 +58,7 @@ public interface NoticeCorpUserMapper{ * @param pd */ void savaAll(PageData pd); - + void deleteByNotId(PageData pd); List getTypeCountByNotId (Page page); /** @@ -68,5 +68,11 @@ public interface NoticeCorpUserMapper{ * @throws Exception */ List getReadUserlistPage(Page page); + + /** + * 批量添加公告人员关系信息 + * @param noticeCorpUserList + */ + void batchSave(List noticeCorpUserList); } diff --git a/src/main/java/com/zcloud/mapper/datasource/firemanager/FireDeviceMapper.java b/src/main/java/com/zcloud/mapper/datasource/firemanager/FireDeviceMapper.java index 2ff6a166..ae8154ea 100644 --- a/src/main/java/com/zcloud/mapper/datasource/firemanager/FireDeviceMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/firemanager/FireDeviceMapper.java @@ -110,4 +110,6 @@ public interface FireDeviceMapper { void delDevicePreparedByIds(List fireCheckIdList); void deleteAll(PageData pd); + + List exportDataList(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java index 73227ebc..376f7003 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java @@ -308,4 +308,6 @@ public interface UsersMapper { PageData getPersonByCardNo(PageData pd); PageData findByCardNo(PageData pd); + + List listUserByDepId(PageData pd); } diff --git a/src/main/java/com/zcloud/service/bus/NoticeCorpService.java b/src/main/java/com/zcloud/service/bus/NoticeCorpService.java index 8fe519c7..16cce0c0 100644 --- a/src/main/java/com/zcloud/service/bus/NoticeCorpService.java +++ b/src/main/java/com/zcloud/service/bus/NoticeCorpService.java @@ -82,5 +82,12 @@ public interface NoticeCorpService{ * @param pd */ void sendNotice(PageData pd)throws Exception; + + /** + * 向部门中所有人员发送站内信 + * @param mes + * @throws Exception + */ + void sendNoticeToDep(PageData pd)throws Exception; } diff --git a/src/main/java/com/zcloud/service/bus/NoticeCorpUserService.java b/src/main/java/com/zcloud/service/bus/NoticeCorpUserService.java index 6bbd972d..78751a8d 100644 --- a/src/main/java/com/zcloud/service/bus/NoticeCorpUserService.java +++ b/src/main/java/com/zcloud/service/bus/NoticeCorpUserService.java @@ -4,7 +4,7 @@ import java.util.List; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -/** +/** * 说明：企业公告人员关系表 * 作者：luoxiaobao * 时间：2021-01-22 @@ -17,43 +17,43 @@ public interface NoticeCorpUserService{ * @throws Exception */ public void save(PageData pd)throws Exception; - + /**删除 * @param pd * @throws Exception */ public void delete(PageData pd)throws Exception; - + /**修改 * @param pd * @throws Exception */ public void edit(PageData pd)throws Exception; - + /**列表 * @param page * @throws Exception */ public List list(Page page)throws Exception; - + /**列表(全部) * @param pd * @throws Exception */ public List listAll(PageData pd)throws Exception; - + /**通过id获取数据 * @param pd * @throws Exception */ public PageData findById(PageData pd)throws Exception; - + /**批量删除 * @param ArrayDATA_IDS * @throws Exception */ public void deleteAll(String[] ArrayDATA_IDS)throws Exception; - + public void saveAll (PageData pd) throws Exception; void deleteByNotId (PageData pd) throws Exception; List getTypeCountByNotId (Page page) throws Exception; @@ -64,5 +64,12 @@ public interface NoticeCorpUserService{ * @throws Exception */ List getUserReadLiser(Page page) throws Exception; + + /** + * 批量添加公告人员关系 + * @param noticeCorpUserList + * @throws Exception + */ + void batchSave(List noticeCorpUserList) throws Exception; } diff --git a/src/main/java/com/zcloud/service/bus/impl/CorpInfoServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/CorpInfoServiceImpl.java index fadc0770..99d0b82d 100644 --- a/src/main/java/com/zcloud/service/bus/impl/CorpInfoServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/CorpInfoServiceImpl.java @@ -82,7 +82,12 @@ public class CorpInfoServiceImpl implements CorpInfoService{ * @throws Exception */ public PageData findById(PageData pd)throws Exception{ - return corpinfoMapper.findById(pd); + PageData byId = corpinfoMapper.findById(pd); + if (byId.get("FOURTYPE") != null) { + String fourtype = byId.get("FOURTYPE").toString(); + byId.put("FOURTYPE", fourtype); + } + return byId; } /**批量删除 diff --git a/src/main/java/com/zcloud/service/bus/impl/NoticeCorpServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/NoticeCorpServiceImpl.java index e5cea23f..05d46121 100644 --- a/src/main/java/com/zcloud/service/bus/impl/NoticeCorpServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/NoticeCorpServiceImpl.java @@ -4,6 +4,7 @@ import java.util.*; import com.zcloud.service.bus.NoticeCorpUserService; import com.zcloud.service.bus.NoticeTemplateService; +import com.zcloud.service.system.UsersService; import com.zcloud.util.DateUtil; import com.zcloud.util.Jurisdiction; import com.zcloud.util.Tools; @@ -34,6 +35,8 @@ public class NoticeCorpServiceImpl implements NoticeCorpService{ private NoticeCorpService noticeCorpService; @Autowired private NoticeCorpUserService noticeCorpUserService; + @Autowired + private UsersService usersService; /**新增 * @param pd @@ -165,5 +168,54 @@ public class NoticeCorpServiceImpl implements NoticeCorpService{ pd1.put("TYPE",0); noticeCorpUserService.save(pd1); } + + @Override + public void sendNoticeToDep(PageData pd) throws Exception { + PageData notice = noticeTemplateService.findByBianMa(pd); + String content = ""; + if(notice!=null){ + content = notice.getString("CONTENT"); + PageData contentPd = (PageData) pd.get("CONTENT"); + for(Object key : contentPd.keySet()){ //替换占位符 + if ("number".equals(key.toString()) && Tools.notEmpty(pd.getString("WORKURL"))) { + content = content.replace("${" + key.toString() + "}", ""+contentPd.get(key).toString()+""); + } else { + content = content.replace("${" + key.toString() + "}", contentPd.get(key).toString()); + } + } + }else { + content = "未维护模板,需要管理端-公告模板进行维护"; + } + + PageData pd1 = new PageData(); + pd1.put("NOTICECORP_ID", UuidUtil.get32UUID()); + pd1.put("USERNAME",pd.getString("SENDER_NAME")); + pd1.put("CREATOR", pd.getString("SENDER_ID")); //添加人 + pd1.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + pd1.put("SYNOPSIS",pd.getString("SYNOPSIS")); + pd1.put("WORKURL",pd.getString("WORKURL")); + pd1.put("CONTENT","

"+content+"

"); + pd1.put("ISALL","yes"); + pd1.put("ISREPLY",0); + pd1.put("ISDELETE",0); + pd1.put("ISTOP",0); + pd1.put("STATUS",1); + pd1.put("CORP_INFO_ID",pd.getString("CORPINFO_ID")); + noticeCorpService.save(pd1); + List userList = usersService.listUserByDepId(pd); + if (userList != null && userList.size() > 0) { + List noticeCorpUserList = new ArrayList<>(); + for (PageData user : userList) { + PageData noticeCorpUser = new PageData(); + pd1.put("NOTICECORPUSERID_ID",UuidUtil.get32UUID()); + pd1.put("USER_ID",user.getString("USER_ID")); + pd1.put("TYPE",0); + noticeCorpUser.putAll(pd1); + noticeCorpUserList.add(noticeCorpUser); + } + noticeCorpUserService.batchSave(noticeCorpUserList); + } +// noticeCorpUserService.save(pd1); + } } diff --git a/src/main/java/com/zcloud/service/bus/impl/NoticeCorpUserServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/NoticeCorpUserServiceImpl.java index abed78e7..c73f63b2 100644 --- a/src/main/java/com/zcloud/service/bus/impl/NoticeCorpUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/NoticeCorpUserServiceImpl.java @@ -9,7 +9,7 @@ import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.bus.NoticeCorpUserMapper; import com.zcloud.service.bus.NoticeCorpUserService; -/** +/** * 说明：企业公告人员关系表 * 作者：luoxiaobao * 时间：2021-01-22 @@ -21,7 +21,7 @@ public class NoticeCorpUserServiceImpl implements NoticeCorpUserService{ @Autowired private NoticeCorpUserMapper noticecorpuseridMapper; - + /**新增 * @param pd * @throws Exception @@ -29,7 +29,7 @@ public class NoticeCorpUserServiceImpl implements NoticeCorpUserService{ public void save(PageData pd)throws Exception{ noticecorpuseridMapper.save(pd); } - + /**删除 * @param pd * @throws Exception @@ -37,7 +37,7 @@ public class NoticeCorpUserServiceImpl implements NoticeCorpUserService{ public void delete(PageData pd)throws Exception{ noticecorpuseridMapper.delete(pd); } - + /**修改 * @param pd * @throws Exception @@ -45,7 +45,7 @@ public class NoticeCorpUserServiceImpl implements NoticeCorpUserService{ public void edit(PageData pd)throws Exception{ noticecorpuseridMapper.edit(pd); } - + /**列表 * @param page * @throws Exception @@ -53,7 +53,7 @@ public class NoticeCorpUserServiceImpl implements NoticeCorpUserService{ public List list(Page page)throws Exception{ return noticecorpuseridMapper.datalistPage(page); } - + /**列表(全部) * @param pd * @throws Exception @@ -61,7 +61,7 @@ public class NoticeCorpUserServiceImpl implements NoticeCorpUserService{ public List listAll(PageData pd)throws Exception{ return noticecorpuseridMapper.listAll(pd); } - + /**通过id获取数据 * @param pd * @throws Exception @@ -69,7 +69,7 @@ public class NoticeCorpUserServiceImpl implements NoticeCorpUserService{ public PageData findById(PageData pd)throws Exception{ return noticecorpuseridMapper.findById(pd); } - + /**批量删除 * @param ArrayDATA_IDS * @throws Exception @@ -106,6 +106,11 @@ public class NoticeCorpUserServiceImpl implements NoticeCorpUserService{ // TODO Auto-generated method stub return noticecorpuseridMapper.getReadUserlistPage(page); } - + + @Override + public void batchSave(List noticeCorpUserList) throws Exception { + noticecorpuseridMapper.batchSave(noticeCorpUserList); + } + } diff --git a/src/main/java/com/zcloud/service/firemanager/FireDeviceService.java b/src/main/java/com/zcloud/service/firemanager/FireDeviceService.java index ae0e4b44..488b0c1e 100644 --- a/src/main/java/com/zcloud/service/firemanager/FireDeviceService.java +++ b/src/main/java/com/zcloud/service/firemanager/FireDeviceService.java @@ -56,4 +56,6 @@ public interface FireDeviceService { void removeFireDeviceByIds(PageData pd); + + List exportDataList(PageData pd) throws Exception; } diff --git a/src/main/java/com/zcloud/service/firemanager/impl/FireDeviceServiceImpl.java b/src/main/java/com/zcloud/service/firemanager/impl/FireDeviceServiceImpl.java index 4717e555..f8e544ba 100644 --- a/src/main/java/com/zcloud/service/firemanager/impl/FireDeviceServiceImpl.java +++ b/src/main/java/com/zcloud/service/firemanager/impl/FireDeviceServiceImpl.java @@ -263,5 +263,10 @@ public class FireDeviceServiceImpl implements FireDeviceService { } } + @Override + public List exportDataList(PageData pd) throws Exception { + return fireDeviceMapper.exportDataList(pd); + } + } diff --git a/src/main/java/com/zcloud/service/system/UsersService.java b/src/main/java/com/zcloud/service/system/UsersService.java index 93001988..5a3ae771 100644 --- a/src/main/java/com/zcloud/service/system/UsersService.java +++ b/src/main/java/com/zcloud/service/system/UsersService.java @@ -360,4 +360,6 @@ public interface UsersService { PageData getPersonByCardNo(PageData pd) throws Exception; PageData findByCardNo(PageData pd) throws Exception; + + List listUserByDepId(PageData pd) throws Exception; } diff --git a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java index c432b75a..a9951e90 100644 --- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java @@ -491,4 +491,9 @@ public class UsersServiceImpl implements UsersService { public PageData findByCardNo(PageData pd)throws Exception{ return usersMapper.findByCardNo(pd); } + + @Override + public List listUserByDepId(PageData pd) throws Exception { + return usersMapper.listUserByDepId(pd); + } } diff --git a/src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml b/src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml index 860f3659..bffe4d77 100644 --- a/src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml @@ -222,6 +222,7 @@ CODE = #{CODE}, COMPANY_AREA = #{COMPANY_AREA}, ADDRESS = #{ADDRESS}, + ADDRESS_BUSINESS = #{ADDRESS_BUSINESS}, CREATE_DATE = #{CREATE_DATE}, SCALE = #{SCALE}, LONGITUDE = #{LONGITUDE}, diff --git a/src/main/resources/mybatis/datasource/bus/NoticeCorpUserMapper.xml b/src/main/resources/mybatis/datasource/bus/NoticeCorpUserMapper.xml index 608fec45..389aa646 100644 --- a/src/main/resources/mybatis/datasource/bus/NoticeCorpUserMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/NoticeCorpUserMapper.xml @@ -147,7 +147,18 @@ - + + + insert into + ( + + ) values + + ( #{item.NOTICECORP_ID}, #{item.USER_ID},0, #{item.NOTICECORPUSERID_ID} ) + + + + delete from where NOTICECORP_ID = #{NOTICECORP_ID} diff --git a/src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml index 4d6bfc1d..0ac65962 100644 --- a/src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml +++ b/src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml @@ -301,4 +301,56 @@ + + diff --git a/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml b/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml index 6af6dad9..abbca825 100644 --- a/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml @@ -427,8 +427,11 @@ and f.STATE = #{pd.state} - - and f.HIDDENTYPE = #{pd.hiddenType} + + and f.HIDDENTYPE in + + #{pd.hiddenTypeList[${index}]} + and ( diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml index 022c4347..7121f2de 100644 --- a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml @@ -374,6 +374,9 @@ and f.STATE = 4 + + + and f.SOURCE = #{pd.SOURCE} and f.HIDDENLEVEL = #{pd.HIDDENLEVEL} diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index 7ab21186..c24965e2 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -1438,4 +1438,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where u.CARDNO = #{CARDNO} + + diff --git a/src/main/webapp/uploadFiles/file/userExcelTemplate2.xls b/src/main/webapp/uploadFiles/file/userExcelTemplate2.xls index 707f36eb51bcb74bef0c4717cc2f42af188ef855..8b884d315bac037ff5290961e21da2a24580036f 100644 GIT binary patch delta 1376 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

9rCQrkp-8{^-s6zT!3R>iqRD^9HTh)b_W%xy{R0 zPHFMoFBz?WzyHYwOYSIf?Uk@*7mEKD_ig^h2E%q-i)+~^YeM6;50*Q8BmMdL%NsAc z65ZtUt0BKPedM80$GWyE-RQpShnjmHd#q{ID#=UdUHV(pbMsoRsvX+ALCeGQ>(%j1 zE7S0c1H+z}w;}EHnp*wlc6`3#q3h9&8{dBQmr;LwIcDyOxHo+h23#qb@WPDzTVsiZKPCK;`fU8ox27k)>r%^nK#i&Du-aU+q_|%~K_>{PJ?`XOd=4&-|uF z(u&!OGRl8?^t+$FZbP*?H2G>y`SH^`KlWtyyLq{#50>)He=@qkBY!LN<*;gT{o}_^ zU0-_Gm3zkxd$ahl+X0-Q$fLAtgpWJAS~c+pAvB9q?e>+xhi2Z20omk>2-K zzq4U)X!lnqpMG|4!wZ#%ojBqD{g<0Bb-Mmj_Tj^u_U`L*^U9CkUw(T~_?OSLexdl* z$a^o{fBo5Ce)}-$>1X#Y{`u=y$IN)D{rAt_`tkjl&o23@t8PY_l*}lpI%N&e|}Ko=bnFZUDQ*(S}%L_t5X+V`+obgJ6>uY`Qk$n9e$bn_;+V7 z6#HcNZC^isZBnoKKX)Izw(R`r|2p+q&kes0uX6geZlAqatbT{cpKHx4d2#j5vukgp zaVZ8_;KH>7rM-=d1&<1-ySaa$d<(dxSn-uX$NgU3hxeB;5K zmF1TmS@C;lY^x3D-yDA6#VfN{R+(Dz_e!r`7&yE8m&?|DQ?~SujqOvC!e8w7c>0W4 zV^3`Uv5vRFcaJnUw_xIJPc)9*_D25~x3By5!71G$hkWsTg(0j&}+hpMd@djAW_OFnz=%j=Ube}8Ac=Jn3>cxg?)eWyxv&cDN2amMHGIcq_^ zvlD+gGPmRKRE^m52YwSPMK_G8b#9Y6cU z=YM}M{{H*wq_(YJ?A0stAC2DlLQdZ=uBJ{~u%+e4)Bd*kneW?%Hvh0&!wJJvw_KQ; zo7Se}sN5g_sJ;9P@BT6W8a?)rdac{G`Z+u9*n`&8l+hPge*WAOM=y8#I=NWn9nR{$AnmCs$3Hx~b=;3}&DW0&>pX7Tt(=zzW|W_M{|6DVu`SZR-ZSU- zFXk2>+B72m^uANq>h)<_>z$1wnh?ycS%UZ^^Ac;NR6%d1R#WNOQ-hLvxuKb$wHQ{x+>AFB3H${)u% z-`j8Q>*tsMef1Bs20R>Az1~aJ{#p0wNQJ)ajCCo(x@i&-I`0>;3QJ*}q=e`lYwV z&Z8w?_^f~U*|bY@dq2B$`Kzn$Iou>PVg4Pf58nCVqyDExo;!H^>mBMG8vM8RcUP&n z_Wh`*VvhHleD2jsZw(#zVdsgBmmc0c%YVMX_Pw<(b{+oqPc>rBcS}CL>By_M9)6+y zYkQ-fTY94Pm4P8Mx@{dk<@1UAkF>iS`*iM+l%wy|fAi7De|=BPiteF7m7rPCO(f;d z!|*>i9{Aw4=2{dwzBItewwIfBf5x5ivD<>)!7*`DF6) zjWfGls~*@qtoewhjboa(?XZ1zg=Ryy?0$27+^<>3yC2*%`twEy@9q1_lWz|GIdgIT z_q#lcUTXaG#7cL*Yt_mdx%1Y;e{`?CF3_$)jq(4E?wj%csuIl)y!_h5+jbot9&#q( z?|*;sQ)lGheW3AMzffQ6(q1!e=}hQ9bH<#M8FTz`3+_nC7>}^w*ygjo7ur`E`19c3 zS6pc`boWCMp-sM8etP5S1B*_*vZHa0S1&wtc+_t{4}UAJ-w|((^w#fRe&WmdiN}Aw zoIf{g%Rl438kLl`YVzXCNACaew=Y^e`EJV&Ba5$S_P~#xElKCM)x7dWrS>hpx;O5t zy*)mvwIzMiZTEass_}h~^x1gop`1OXlf(1-XN<4b?d63N8~I9WUOe$l%Uiv_+3>*3gusK}&+T=_`$LZ(KEK)Qi%z*4I{mxi zg3`T8Z~t}XH&G*pd5Tq|E6FN03>Fm~pdAJ;y@!`}6`W|mT_4TuO}J038eLga8tDWL zHdCrBLA&d7SPTC=7@80PVo~QHP8Kf^Y)r`>R2Fq6OijFSW*v&&?Pt1oGuZTSzL4!O z*YjNsQIIkN7916uM)5qfofQAgF>-Jl!3zS@26lxCv|(Ewj2u>i2e~xeD;7@HmBxy& zfu7>q5VWA#7&_M4Xe-O5mMhc0IJ%`^B0Wo*LQfvfp~n{R*9d+dXbL}x*pZ&!op!s=!w)hv|ZKJO7`F)(kfEpH*&zeq$ie+rO-bdNBPU!g3CK{`I&!{kR0_p zSv%=c!A=`f)W8d$8)!v0n*KfK38iFNIh~7H-_Y}#bR+kTJGfTK8-wxb71w|((4XLj zb3djO{KB!y!G*Sbf2-_`Fv>6U^rZ%$^;DueK2Lcf=no zMO%XOKuaCkLbp7a_JB^W^0-FLuhNdg^2GAJP;WHlJl5})*ISD;yA7?kXy@>1?$x{L z<66dxOXy=;;)p2vcsss)9DQ`j{5YFFhG*@M;g1^&=+VfO=+?B6J0j{zN`nAppO4Lt zxiUVHv$P~`K4y59gtX`r86QVog+9>vS96!%O&#+3-}m+1Ro3!!pdG&+ zl-g73PXDk4(FqmLEm(SYDa&(ZeA$JeNujrT2D)UHzC~xwjFC-bXT+v{JYF`@mGqz! z{p-S?c;~8Ug#LJAiEnyn68*6*;Y7yRIQnC7-kyXT>GI_6j0yaXl)6yjs^{i%)hk(l zjINMsqY9Mvye-&`a7tUA`(jGYDZn#3gabT zI@W>ebfLR{bk`w1?)paGz|8J5^eKvV7w$DT*)!)_iasuy1Y`&55_c*)qeAM=aa^Md zb+!{H^agFT#|8)bqQ&L)$8Y;gNU1wDBN(D$N6Pg8M>D)1j=q*b=i@_2nR@te;;v{( z2V)Gu0k$)}OBts{vy6R#?&&@KvZ@+MJpR|6MMA?dDyn+wAERZB_AI6zL;^DCN_D8l zx!l!B<asOgLyBVc@>CwN$k`9lHekVTFcM_`q zXs)9hI0GH&!T(76Cr!Js^YD`Jlq=&|$!5m9v83c2V$>mUGf8TWkT#HTCirxP=HR>n znp1qmb6eAuFziytPIMP&j&8qlTwR|{z+l#qTJFK^Q;)_)-?J2Uc{P`MbY*<)sM$%` zK58H=CTg#gL{)e&U5r9JHzrF&*18?PoY*A|E^RS4{wr9!q7r*K?J4gVwLA$ zf>%ME%RRhRQWVD7p3a2LgC+?{h>bYKC)^RR^+nh+Mz{-ACn?(@=)8@-GZ|+DE1{9X za=WqsIzmd@0%@v2*cZCjo!+7L9ni^LQJvE#=Y=I+&86n>$F&Ulq!U-))HFYOJ{ zd9a0g^QE2knR6AHt}KvFEPWhjOIkktNJ zmhY_KfU}hC38Up2wG%(e(({OFL(F548?}*{qn#^E2~!t(0GHHJu(+1HK};J$4q`mu z3}83ZLVUvFxpK_V0!mQ_weij#0JC!Ftp=HgeR7!3`?W_$b#aP#XW}zs8sza5ujY_* zb0^K?*&s9LyuWsgO>CfxE<^YoAo#Dg*@jNE32%&vl?MhblZ9UyKQFp#%DLDpfxB4ynF)t|8_fGzPVY+Oho7;~ zZSn^KXd#kd*V=T}svOxqj-j_`2OOlz&6~bspKL)mUzi{2N#pt`x7{SEwq{ZhGrDZU z>#wrBsWNh?atCTbI3viFgt9;Tjm=spKIMTyNBo1XVsJUI`6DZLhNw)#hZ_@m1~3#X zeXn0nJ!+;90!6pVIHzfGD(kq{zuC8LlkBAe#pD9BYL9C}E4OdE6QCqguYaP5g+zBD z3e4@uaU`X}fSXCtcb2BR2IwxDm!oUM;%ri%>p8KhF~U;_Q9}^WMfkgp(8wvX2jqOZ zWPi4Vi%%%GQjU;vvak)nb%O<^?_4H=PcT(u2>Zb_Nr1jU#_~!Nb>Gya21pPlzy@P( zCjGeNyC})9+W48NL4HWY3XmilWoFJ45w62;2uKm{!Vsy$m@M>=r0?9cQ|nK68hPQ| zg##siVKI9WI;lxQ=&i6hXnbeHR$VfW#He{l%t3ToTHM)%I%G0lA2LMesm7$0mE$_) zNoe74gh^xe;JG$^=e+51UNEyc2%-(HQ89krbQw28yig4_Kfy=|B|afGHOK@pOi*#0 zK?9T)Cqp!to)ACcKOE-)%+AnrlNy|k)Hb3kM(C4M!&fIx_Cpvs#sj_VEPDEzuY0=g zhnl@QQxBkFT`|OOZrZY`Y0~yZhbD25lbNF_3C9F#&<1#A>Qr=E#YAcK&@<6-Oq;M? zo=CDYR_EziL4>wA0^b0eAtgZ6Ae4X_^!l%*{Gj@v3=HhRk0HxMwVUKu>o`>dN($>> zIr;+Mt5{k|0eys5U^#mI(PF9*c7>6`5ojpOF*{>qg03N=0B8kTkP&Ry#8lsbB`oRg zbPi;UR?wb|Mtp&L(~_siu`n8eqZn}-?S$FV0}1Z{(LtA>?!2%Ii;=DntqQ?n2FFOU zxrWms^#$RQ?JdAq!IWf~o$%(QGa@2VgNLIKJSI-!5IO3&n)9IPK*4d;Vo7FaOxr4Z z2}$F)kQw?)2)@9XDBVjn7LcNtny5xvU|j4P6=?|XEaC~h8u0oLZ+&6`qW~9ERyXdY zh&701W=;z+wZZm;B;WTlgdA7;U*pr~wp~_rEPy!(l?apy}Rz{PeSuxm5d*r^1C~2SQC^`=?5ni(j zc>QG;O5v*(;0_=L4p*PZ4NQ@TmLfu*T1-y(Vs$WN+zTA<~0DG8Vn`iK5v_|RW!BP`~; zU-Lu@n6u%jpscJU?K5LjCo9JxVi%$GLg}atkFQCpbUir7sG^vZsYZ{)lPP+Tl}SOJ zI}i>#mxim(POqUB04nr=$%;B8jrfE(wWp!XR1!CuBr5P{XWzB19;Lk!W4m z8MK~-CqYfjwA4Z(ZH-7z0L#GezzAUF6C-2wsnX@TA*U0p8pgEn7|XrKsq*ch}ywYCI<`* zAS>gtwXel`L@+Mc;ax=n(pPLUW~+RKh}@uZ)Q?sEZHYuDF5xl%LN(UtBrE~~gWKqV zivOIq`ws4~2s;E2bQ{gl@jf|2S4n{gAm{-G7DG$A@Y34To9D-#-h65N%j5sTV`T}szBT%6-=Ek%+kG5jbZwijh)`yEsaq#bL8xUZVOCk z90bX(CoN$4ZWG&Ha7}PNm_aeap|w8c&uR zePz|MUHC{bTChr1oDP9CDSCyZ_A_DG!YfnHvokWH^rWv89AgdN!K(|1zGEiSO$*2c zpXr$xL!3yB#V2e^kgf>!rnFSd?yQAjF>>qJ%vhMugmqJgNA8n*lIA!j2GHq1*WPVg zS1QbeRHRUErLuzf0!x!liuvCjIRgbagmPhL&{jJ*z;~cu)DPM-H)0bm6?!FhUs&+* z36s?rD=mQ6Knqf#>iTp~K@|f7e4+W0aJ9{Yj#~$~f zyPzdvH9o#c9Y;4sR}rIPjA{Hj$F+#5tm1V{+6Z8<J}WP%~%^3o<+7C80N>HFN`t3}N!p>*c(| zliK)R@b~ilh7J4sSJW1P7e-bQ5w^#H8>*4;dN1rwzL5S1i}^aQuGo=QBZ-C~FW4`& z7(P*lS?G>v6Ala>k&cJO$PEIhrEq~Dhfs}2AuaGX+E9~*FG3d}VN5ZvksU#-*pZ;d z;uBs{Y9WS0ED10#v060Gd1Ev4_WI9d=oNzUQ?P&N7~3zc3AcKLYlY^R2|sNO4Brj^FkNVRUSWG6@TyroPArTO!vj|Ib!~WdJ4Nn*GRlqmQPwyN{ClX zmoNb61l$<+=wn}CmW*>@eu5?zo)9Gm2GrHf?Uew90b+0w!(uWfc%hR@6GCs{+8S>S zwecOERD8p|N!-H=JN2|C%n(BfQ-Rqr7g3dl;acuE(Jhb=DvZ&BR`3kz^`|CC|0@I~ zwz8lzhzVewar34>rgrb)gkX1~1zF?5&hvhK-NnomXaUMkdU5;6YZ+2s%P!oL5VX?^ zDmYE=L!F7zQ-X?$KpKY3z4Q7ft&o=sl&YiW7%@rd=#n)la)TQZRxSgzp;jaqui2}{ z2*DN+fn!X0>uS=iR=tL)=C?Mt;3{Y?fN+nNw-vS+P(@%b3R@SuyAwc6j}1(fVSz zQdtpTpcRsDcE)LSiA7<+Xdnw-SdN`}LtMF1t%57IR^g)P{NH?z-6FvNeg*%CV|bQr zyF$&uFbMqPUZw@)7PT^4j6d{9&hyzB7yUz&j+i+}xHZOToY*2p?#&rVikKeqCSUX0 z($q~@ozS#Ua_o+jo`GNJx+Jml`hS_Lw+I9~XeL^bPNRM1Fr~xLA2HH!%)%{DgJ@ef zn3*#qS}TSUD5yZ7O!kM^meXHVp^s8NEG7ZTW(CK%6!+nH{SPQ3R29XV5}HQr^#U#| zW?qg~1ceF%fmh+G*$Gi8`r?KNq;VWaVIb64cE-sRxmgXS!f4PI<{|b9lUANg(I~=H zpsFHZW|a7Zn@OLWZB%7gLN&W$?J0zXxlE2gcEZxTYbvLT5x_}eKNF3!hRV>|jIFqK zDW%Y8L(Azp8dXyR#0iho6<;9_A5m)3?+Ih$LT|N-JDJgQjL4OyM(I#Xly;^2q z#OQdB#F@*bBT(uqVs?*s5L^g09r62e3InDVj`nUt64)V zVW9dVP-C5m%nRSER}V@^Fkm=j-e?@0r`Mq-FhpAr6)QSj2v<8qMw!Hti^uL-Zpwl* zwJ11jrW6taftTgRJihb(0-gs-1(jvb z^g+Cwtf8jpDn=C3xl~8^XxptoN@2x1M+!F8?767Hfia>DX0g$Cbctgn3WgXun^{y& z(^nRNjH3_;{6i<_iWd+_cqf_TW)5vpI1%!~3@c(X(jBkAN9q9sPqdjn=fU_Qcxs7Aw8tCQx5Fj;68MhrS3Hu{LeSKE5eE-=wy804t`=Bu3O zU?KblJO|of7B`dhB0@|~7)0@pr}?m$eV$3k(uG4;(IQ zaF4`xljK^;Oxlo^U`joCG*@1%$M6c>#B`{qqDxuHv3eDcQq)0whkra3b&e||w!wtT zqNhsQvLE|mT{vJWfKBm;YH0!)-V;iVUa(G78ud|@TvMP#C=$j4-h};0=eXiygZvFt z8dGw2HI-qvhXg+{wtKp~;-uzwGzr1MxloOR2~ARML9ysEjzjny^7_-YV^MoyB4Ac? zOcsT-;!2EBAQ7QJNeLq@&~8$inWu!nV6Si;T*K=pJ5{@*D)5Gzg{xu}D&=byZ{va9 zAWl-Qj8MG(CaF4TRUSncg$!B;=Y2C)UsO~M3|>R@mzkbj=&*Jn4=5|<4XWV_OpDd~ z5@G-`OmM~EO9LDhqt#Sl2wwq*O~-u!c>{=1bSRf_ldK?mwJa1*EHH$U((z?!FNwR^ z)cIh6^Wop2!!)SX013UD`&B`+35@FE5Q-UON{y;0Acb*gFM$lx!fNaD-RsGO!OWy2kR6YW(JF zX)dc9o}!EF)_s9%DOwf8Ab=xULtsg5qy?Hd?-CW421KmZ3@Q>+0s~ma7SlVH5Fk9LqEwB)4c4^6BG0$xcT85)- zSTVRtucVApEF;iW9@jHb&xpMpxDTN_XcmH$iU~WkJ48%_#52Lr{L~0Utm*$c67>tz_E&Gj%r-XtryTY zYzR4m5NgO7!t4KWiI#&HYS0t`5Xq_OEC&MULKTHOC4>`EY3gzox~aM&uvpm!=T%TO zj2nWJ#4N-%*fa256kE@yOV_DsTge_H2gBv{;Ty}Bs=X%F88m`*B76R*U2S|?^OZ5f zqY5>n?tD1S(H&^Di1KCl5f<~~lAr)Zcy8f2sl(~fQ=;_DASPYRZm@8;6&{u;dD^;E z2&0xsJi?hd+Ho2Cg9iW`?g;{=i^{%~EZ}^xQsuh^$3^!_ZkIAMM&3^zpCIo;SAs#q zs0_tqQtMV|;i@`t_V8v5*&z^XHadjjBBH^F;`%bR@zUBJ%dh6zv;`P&8t~ZM#zeaI zr(-ik8z=}7oK1K_58-s+q?ko)T5_zu+1Cs*j-toJb8zCb z(ofCEpRWfz`~(U*?JOa$|V6yz50;<>r$>qM+3d?C~U@ek_p z2IN2I>B~@x1N0kmlGn{BfECxzy`wq33EiZJZH^AhFUOXegq*x>XkJcj zb;lGY6O0Nh1aXL-!q2N)T_7)r85#;u`0v*E%-v%WRVKNJ}PtHxVW>l&q_Q`-lZKUsPIbEA221K+2la*6L ze8O2W3Fe`uei7s$$9@M_U*!F*7)mHAbO7ry^o&rdjh{44MmB0Lgz*Cft&lV#^JMsE zFwlxv+ffUdIgj~u_@|~HsHKQrs76}g%O%={p?8ocLPOMM)Bb8(%jtR=6vHPbQPg00 z<&yg8Js=?qF;l?ETGAT7 zgAQYFg&35H(m{(dCg?ZDf}LRcPU&3?1DG0I9W(rNsop0r%Wg4e^6_TV-9jH= z8(<)JhV=b1BG`e*VX!b<;zyVG)pH2yeAo`8$nE>pEx*t&(Z0}mXg{5w7U-EH?M6rj z=V7pr=(sQNkXTE?d7unOfiAT%F;JTBzOz{#YCt~t$1!GR&d3D0DPY=wv@k~OkjgG> zMmJDPFQUd-EOccru9>Ur7=18>hk=h_>s~+0cAK|QJV*;nz?oH(!XL344<{!i0hb7; z%#v7^Hdoz^g%(gpI7h@K)Pl!XAyvCgRYQDYWT{5+6%Rz~O&HdxR{6q3e6_vomfc* zZ37%2NvHH|LPffc#p(`;E2iKH>5Y}i*V=>RO!g~GdR`d>DDM551#AN~hF*moA>i5&jD2Vz{9ua-T&6GAI`R5Ngng4=3tdk(8yt0>rdH z$Kw<9m0YF&XhX!$bo`0jHR@sosNh^2g_pYBI$G7k2AQ4FVYW6m1p{^%AePZJx<5gx zDLkk$H^4}*ofh{%bkGB)kdYW*b}i>}&n}S9@S$Bu7nH?{lNTAee!YxQGY4D({;>*u zwauo4P!KpuydxH%&eHrQo_sS(jP{`k96@Af>>gFX46xmUQI-8X6QySsH3y>wh>d%Z zzH{l_@@gr{phsfuj=r#~zn-%yP2U73wgMqZ$P9B7@qBQr4C=uX{L!`u&Di9_V*VK2 zQ8^7U9xz6j8+t0|9(g_CeD2r;eZfiyMX456JEXqV#!rjYQ?hCflPQQZp|F@KD$+C7 ziJDkT5Mj(-a!MDohFB5^eIf)r>tplAqO)LuZn28}gA_>KL<9XZ3IvmsGtZeQJ+p}R zF}&guI|l}rvZlob%^R>4cuRP8HqQscu+zcj2d^StQc2nBQqyeIWDv=W)7gh zhqJu;(S>lmv1udU3PvQw?3GQ_uDjB0978`~E7Zc^JiRNgMpDd7aOIAs;Tq6+8CZJFdfO-ox(^pX z4QFTku6!a49s>XY!l>AZ4bGF#{9r(Z@GyXIHarJ={a-tUCyWVRTduTko2GACQAUaO zAsnvpYwD(iTs56KjRBo!Rlk;!p>F>&(FWWg42*i=^*5ejQ!+3W+oBK>_wsqQMiU6a zFfl{Oa8ln^rD72D5i<*)f6jd0i4Z#^A!b{4k%RMMQ?+9eDgZM=8*;86MUVOYLtWfa zauD$p#)5h|Y31%wdZnohLGY9_@v^mYt#3CJj5OQ^%js;aUdpKO9peepvrsHyIbzx; zx_#)LJv}#}qi6wkhd7MqSj6D^{#;lDR7Pw`$t7oY#^=#``#}jFOz}4h#ZMbwddo@G zK&R0X3qERBU7rqM%oYTMELV|;!-F=ZU}lg9yaXxOq?PT}txYy%7#KtXiG zuq-VwLHAXm2yYBDHWmGlyEzU?fh+T@oEEC~e^m{%k5<^AKZsv4SFeXv>;#hsOF6Ew zsb8ymqD)Vq$l%H-9cJsx=c)~1@CYoaMp|6U>2e;1jFiEEhumz4OZeQUw*i$oh&874 z+}Rm(H%(Y7<)t(b-W{prYqso*yCOBO;MJtrd{Dp(0Mw)%?6t%5UPSuL?ja5wcM8y z^g{!pYr<2&Yw;ju=Fp9#>Q)ss&|ra?f%`Bq_KH$^;{b$b=Rv%d+ay)r(5l3Ta0vf+ z>TEG1XU$2qy9jd-CIKdxpNQw<*}K$Tq>vtti{XYVVwCKRo;lwu9ts636k(t?YY;-l z{E6@STbOfKkkw;qgr}3XGIpk3lBiu9=%3g$Bl6vo2B-X{b^w%) zVlbdF>rPJbdnUj%_Mz~czN14Ld}HOOm_ zcQuzfbYZ8>p(~@sN>ZAnKjBhzMfG5hu`D=$zMbqpbTyu(5vX1eZ%=h*hfq(|SAK#%K=i~h&HxAQF!i& zS{x`*cq$T zK{bwf2$b2;&5V(ctz~BfoDZR)0v01klDl9+l-H!B;!(Hk4BN$SG0reCNQRBL&w`Jm z#yY2Dcu!aa67}uqs&vt%YU6jse4%zF)JO>hmVxTXeH9b+Gm~a`U_2OnYK)cyd$j?f zx1fTd!gzN>C-9Ytx)YbO^k@muzSIk<>0MVBz@!(iy0U7K(zAf$(lwL#;#BR{Bj%d@pVn`fbBw^qs%2 z(GTPepzoXYjJ2!<^o!cNCR)~Y`g+vF>6UepzD>E-e9M|n<>!~vw~|u*&h!mzJF`P#F62CE^o=@t@wR8mt;{L^=g9O#Ix#omeG;t_~#?4Q+@^4UdiuG zb?vL+&1`=+*MHv#Z(;j;KmG7nX<~)1RrOE{V~dR~R`zen^#5YG`t(@4={HVx8ybp^ z%jYO+Bh*^VQnsx8vK7fag>WA2TeVD{ewoS2uM?w>7blIg%9!IJbl$0QCSQV7D7l`= zm!vaK)iC)|=vC!d-5$QSH==?#p3A=lQi61_xm7d9OTTB*LjBo~{-=Z(~#Y^NoR)6$P=89PZs6CY{PBp1#@>mGvFoxp1 z5_BGZr&i=jQV!oZEOMo+f%Nc*%7t1(c+|wP(o~bw(K=7{^Xb#FzP0XwX5FCgbA(pi zz+mC)aX%ukidOL(^QpX|6>_6Fm3gevH$=ZEV|$Sd_&g8hyDp)vUKIPeYWbS2_Ns zZjpmNLjINLv#KnoxrH#GUHo%i)Z@4U4Bz<+3>8O=lsm(B{sRo({R<4i3@_?-Aq?OB z4={Z1FE9i%yl{%U4Bz_?Fg*Vk7@{g(&}Vms=l=r?FZ>0DV1^eg-<{!w{{X}H{{ln) z7Ib0>N5B>r}FvAO8&z<21{{e;{{so3$h8MiHJHrqE0}SE)|E$LbGrZt; z-5GxLKV;aaSQYCT9;yh!m`n+;Y>K0@m3SyWnS6X-$pSoz(J#XyX0kb%kdPfzaH`@% zo+@05X6ToL>4g)X@$|A*c<7sW>2G@~Px+c9_zT)C>&XSfvnY>t>4jKE=>VmJllCHuC_PW<1xhbcdWq7@lulE6h0?2(&QLl_=`~8PQ~C#`Hz>VH zi44hli_+Va-l6m^rS~YEr*whR`;DB(9LKB4p}rHhm zl>VUfZ%Vf)!4Y{V6{A#~QV6AglUG41MSq7;EkYu#YK8x?uAOTvp1Z zEYzi}v`bkTm$I@hW#wGT%Da?Ra4DKAE@jnR%Bs7R)o>}R=~5Qv zQdY~QthP&89hb7YE@kyx%Idq6H3%vbYj}&+@OX(_(K`tJ9Xkm9Ip`7R{ZDrg&r|KW6&Fs3!xk|M&wFR4!R<8B`F6jd74)H9$GsLCeQg< z#9%AygNqTg%Uz7Nttr}y=7=#tbetyFv^u_WfKkD5e<{r+S6~?R`>C$)GqhfaalH>{CTr&^eI<18AGb zfdTYP)65)KBmS!QEU!oi>fGl2esK?!C6%@;X4gA&X@=|Kr*;Jpq# zh?uHmP(m|+cQi79h8P)?bTBB%3}9Kn#2#a$<<&Vm1MCw<;^(4R1|^w6{$l7sR+!R* zl9~a0v0*@8-eO}=%E6!%GiW3+OEH7nbk5G8ltTukn8B%mpF;+N6oXQl0X)B9K$c=- z5b9tM$_yGy%ur^~MCa@bLYaZGg-~W7ZQ<$5(iTEB1I#mq0aiw46iPc7lx7A^C1z=6 z&`js-3`#SD=5!32SehAR&4dgt-l1fG)tB%G@I{6JJd|MoJ0HY9l8ljuJw{>+m-PVF z5NWm4IXeSriSY+zgdW_4CMJKRG_j0k0LwEB=-L?NTFG|HGK1DS2L^3)4h-7r92m6I zIWR!WkU?3Y2Va6gehI~(tY&~2+c3a#)-b@8gh7^KP>yBLUZRv^8FbJ&JA-m81I3`6 zV9*w$kla%-D5n{~&l?8xte%YlmZXM3d1la2VwPtHopjF5puB@Yd1fHyh5T!ZL3zyp zbBkd>zw2&efFFf33@R{#&Jwc%Gw7mob_Nw33@X?dM4Y)KZJ~l@fceZYsOVsT#i(IG zyX;i6tHh+ebINtoIXeSflQ4Qvkr{X|LJuyE`%E&Zs2RX_M$$Dmq2bsOH?~lT8T8P{ zz@Vqjfk7{w0|QeN3~r}m(8Nm2AnOavOxBK1i2*FD5-}L6XCTbKhDBuu3tY<@Wc8Lv zm01pbbPg=Sbq*{{O|XcdV_;F4S>#V+zqnNCLS-!n%=v}^VhSS%%styKKnE@g?$gV0g7@%`t zFi__p15?v3gQ_+LCQhoV86ZlIq<;dXnu9?#W-v$}gD%i`GM{QJgCRNx2Bsz$45ed` zK{aL|BekQ-9;#^um_rPM>JA3gnSqMbs zM(dni55m|MlpcgJgX9rBH)JXXVVVJAT*IK2gF!9FDAZyGVeOlq!lk)s?7|>=^Xq)g3iGf5_JxvFka`tAW7#i3Tl3=%?wU` z$usm^rHQpQ1H{~hK^+H!IxGXlpbpExFH!2S43c%u&Y+HCZm7cyM5LBANinFS86dJZ z4C*=<)O9eZ%M2z+%(~2AqR!bF)O9eZYhz&5S9(xaGpOfaP|v}jo`XR>W-v)&)?)^f zbF$(3`8t+jusHYiV-C<-<-@%~1gF$^}kRmbbGlNu}voomgU{K#CgRCk_ z2K6-qtU?Tf1`Y-d91I#TgMh?rzzouK&d#8LgFyo!gD+VVhbaaPn8A6v+u$EGIi?re zK-$~wA~AzltX7x8Rx8KTq?nX%e#`+j6?j*%>r+ zFlfjOg5&*$ngMLfFlgjp(8$4{5i^)BF&i<189HZY(8$4{5i<}mo{4X8ADD=9VabNU zZOmY%Z1*;1aEH!eW}T&T7=_t72L`65eP+GQ#=uI%io;W^q;;ES0KZ`vG|oHC zWso5;8?y}N=$xHFV}}eHGlS$rjxN$wtlwBOfR{21nm8CVaWH7Y3^FBV6J{`1=j;rc zI2bfx1|qsJtM4Y70eqri(A2@8se?gNW-w1;Hf09$bsuvlWYUB zgT9JE3(Wv?nPJemd@E3v~)0NX=7lb%$Aw~W=_MPm4gB9 zR5c7*F@t3ivlTN~u5)$ zgVqiPtp$T_e0|^#wc2Q{86YY!4B9vtv~e(K!wgnQ%r?wmwa(cYv~e(KV;co)r?Q1M zngL=E!=SB$L0bodw#;CS#B9q9*6N&{L0bodwyrX0s~I5TF$~%{7_@URXvYlJNz8W4 zV7<=S8MJdSXeVTl53hV`j~az`ngQY~!=Sx`0UjAKnuvSxBl%Ve#0PjbC6aHd5IH-8 z_6`Q^nL+Yfe0^Y{vc~qB0irp<05etxW`H*F49_6GWkckEzESoV4_rp_Z5-kl&~x=M z%!}12hn&$)MrgQebcV_h9 zmXEq}FmLHJ=`aX${M@}NGe4PWj(mMP|0bP^)j`x4BtLs5sH9A%j zk$n3Q+U>^Z*dq}+FgT!dU~o|9z~CO80|QeN3@Xtv=zTY4kpB+G-g-}seK*Yj>lVYH zyMqB9ULV9aGl35tf{EnYnnVr^4oe2zSq6u64h$kF2L|}vQMw{HgyX?#%JX#B46sTv z40<>i;2CJc0FMhr@(opB(1Z2=K8cCPU?MeF{FJnj0e+^C81OZ*Q~H`%56u8;GQ*&! zgF#PbP+6k%WClld4l=l3=fI$v&e>(qlNp@q1UXMv!=RUgK`)04dNG3s zBuX!q!7-h)%b=IT2lQeF)-*6krgyO}=%pE8y=fTS?qG1cgTd|0;JC!Rof(|aIXi>f z9Sm-_=|R>h#o%_$0IOTWptplTZwG_k%;2QN?9B`w)HyqY-VO%6nL)5M_SOurmNpFf zI2iPCFzCY!9+H@Sn8Cw3XJ^pIp^1G2gP@()KAHhm?uJ3QgF(21K{zvbL}G?BgGY7F z&LG^uAl$~lT%`|Z2H5X9QU&{6MeTKoV@oXaFSs`LyCR5-eGdXxs>&HDI4HY zHqfOk(xq&WOBs2?0{n)!lnr$$8|G3r+@)-UOPSB5EXt*9q)S<}OIeIdS*%N0oJ-j# zm$K0=Wn)~*aGfD|eB)ipaNQud9`^2o%MxA6#=Ddyxs>^X$}l@bP?@o$2!|y_uqFMC zYKWScRUXqh`1Hqh4wm$U&e?r>gs`ORm{~8DRxw?Kwqv??)3=ZfV z7`#9^$e_PX29}lqp5YVGCH#hAFu=h8&k_#e8>WFdfEm0bQ3f!Bmvzpr2Ll`)b%2lo zudE{Ws!!1_K=o1~P-w5@jGWctz(RgI9IVE`xy%26&oLMVa|J${eT}z$Y38 zkq!ot%s@qMk<8$X#EfJaoYgrnFg5LZ5XlUJqs&On03O&d8026uh#9B|YY;PdO=1pW z2CwTJ7^nzq5X&HfjzJFwF@uO=(8R3bD!Le?8NlBg27?_81~Y?yNR+|M;0>L_D7>k2 z_E8wj43s7gwvECmJqm+01I#Xl!4L<7AC=))QP zf5=0o~L@-^#0v9`f!boNWh?v(C8x^=pz{YLy0$n z`~H#6+0jRE-xc}@MweI9_5E%mG&*7qgYMJlJ_ovw(La`WK1TmU=j`Y{2fELOp7ofz z;^5Qhh;9seltzzophq$KrxGuU(J$(p9X-l{9>wTlcfl&J_V%JQI^rmUK2oEPbfAx9 z^h*+NB%^<(b9VHR4)l?Xj=P>o>k?E9FjAu*99?j^NC0;b6f39_%SFTjAHa}Wp76@`Zb*c`Zqdf@B1iQ-@Qjv z-$!Y5#P9}vv_>E8==*3!|4t%|X7uYiXYc!HN8d*a^k!E`=Of}2`e==g)q+7EqtVAW z(8nA^D{ag*%Uc@-~EiPEY8p9V)xke-OuRQuS%;@*nXASpZc%< z!roLe^&)srVuDNAM3=HjE@hKl%2Hg)QeDadE@f#hWm8{7PGrEFazd+J>R&27Q7? zpTOv9E}X#VB_!Siw&9XG2Xs@@?mZ_64>FKfM}ySbY=TCIO&Row8hxSzeIlddk#6*M zBBO`uoE?3l!+%X=bcS);=v8T1s5 zp5j1HVf6A6FNM)7=$sur#etr}=;A)}eEmdVibjX;Gw7)rJ=G!kR7S5T@lqMRlFr%3 zJ=KApD*FBgv@VO@#jKgC(cxtcdO)KG9OwZ?uPpHbj9x|O?C1dpdcYMupwZ#a4SJeJ zPjg5%jw8!Y_j4t*g%$hu1qhp3Q=+ia&bVjdCN8!(=GdjL;MdUEc)Ymzno0>pZ zvD$P-Pu|O(Hebc5(=|F`34=aEqt9S;6@AWN^ac`d2KU{ob3ivW?dUUX<8JA3pP|ta zwHWl78hs|CHs-)Cxc#774G4vl^XqpP{& z4n}V*@$TThH_!YIMZr27RtZ zpX=!RTt=tw?P6~;m(e@uoW1XJ9q4lzUB94$0ri=shLgos8Z~=j@Wd(}8}cP4Z@b zzf+@QU1-o3Y4k-7^hJz*yTn_>=)HB$j=so&zDP)(@1;u~s`|c2qhkeX&=+g;#f+}z zxW$a#N8&AJ^l+U6x|-h?GkOHIinwmE4INing|}I((XrMw=u0&E634hNVe|-zw}jFA z>YRPtmpIUu*d%{ywc2}KqS3LcHt0(=`cen_QbzA5@#uSY>74#LXGdS^ko;0c51wU~ zGCKC5BC22?>c84)D*8C~p|YqK!TV6lT*{Wal&x?nTj^4^%B5_zOW7Kivb8Q{>s-p# zyOd?Slx=V+%W)~&=u)=Hr7YK_Y_m(*T`px?T*|h(l-=!8mgiEo&82L+OW6*WvYjqv zyIjh4yOiy5DckE(wlAm*(S8<{87s=tR+Pn7G(cKP7F*Fkor4uc>YUw!WI3!T%kDu^ zln2SuHVjQS=*u+vGDcTxo@I84KsPlJC6}dE;lGv%^q`gDGK~(KGU&@S z`f^5Bk@s>&A0qLVGx|`S1G=dRbTw-(XY~A_=U|p=bXc!JU!l=gFuL-{D;Ry4#9P7W z!*$Ls`4tZDxq{Kf_d}WQepsQ=;U^6GN{znKA^DYzK0@NHWOSd-*(JY{(Us&^y7qmg zMu$f-=&LmPDu?7(F?y85TgB)jbbof4lzFMQNW^|?V zs~J67;;m-%7@f0AezgOAwLs^UVZL4&uGZ-Avh>{*)DrH>S)Xi(I!E8vF}k=nB>66N zZ^$~0jycMpuh;1786C3_`o5mg6C~bxMo-i^pkvMvHPQF#l!LcfZ$r=5PaLh+=$H)+ zdbUQ-X7uqAA)C>YbPnV0*EyiW#(9gT6tdZ(wxHTxfFx zqbEze4czw$ItO%9(?0GS7(FYASB6n4R@IoumFP3O@6be#i(={jeZey&aW<{9{0%>bUlFxc#1u-U<2Gs|FxMA^(Tn5lDi z2Adr+*ld%5dFFMqW`NkwFu2RX;4WeirFGygW^jkZyo(vk(mDGm+~r_!m#Yl!(hLx3 z8U|Y&47MoZ5Z553?i+0vfaB`21*m}W(M>1G00$n&e<8< z?O<>>GdNWq46@cL26t-)m@y55JO_h3$0+16gM|_^k7aPD&e<8{IT+-*jzXSh0PkrS zY;!Q!=8(ZQX0S+NZes?EbIBkyo9*dZ8X zfPpt$#eX|A1I!|Z!A@qdT(-N@A%mUFV1+&gOb)U^g>ZBQbX~gS9$m zm%(lagWaw&*sU30)oK{*aWL4!43tmY!wl9*%stFtz0TPg>~S#I!wiCb;vUTaYh=S< zuYI17(eSnL)N>u$QB8H8<{cFxblsf_>s%%>XNM!(bmX*dW{8=U}jp8RY0= z(8P^8XP3b~2ZMdKQ83>RvyT~IA1kZMpV`L>e&WxW$39j*^(1&7Yrjj`0hh9aE@k() zlpS&@yVs@cuuItym$Lg@%8t5}-S1NNfJ@mim$Kt7WhY$9PP&vm=u-BOOWDINWskU& zJ?c{SHp+OU(Vu;4YoBGuZE7u-}!z ze$4>3Wf&ZAFgU;r)XaK-8Elc52bjTDodW|kvmS6TIKT|V-Pm~UNX+dAGy_<&VQ|pF z;GjbW2bsa$67wK4$kREy3=TRN9ApMwk2AVBs2RX-7zXz+gKe_idmIezVFugvF?iG+ zI%j8akAuNIwo$N7sa=M9Gy`}k!{CsE!6C;e9AXALCFUWP!7iP%kHR4bgF|8zILuFGk{Mt4DNL>xR)8Ine|>~uv=o@%MAADoLvU@IvCt*lYv=r-K!bE0~-d19SjaT zM&U3s*efv)GlP9PXJ>HO!Qe162%cFFYXpr#5}?b_UoLT!4U_8 zBg`OJ6OU*Hm|YBm`<9SrVg2ErpHmsYlLzh;1W+Aw&)!QcT0g9n(weG>BlW^h#J>eP0VQ|vH;G~1WNoMe%#5~Ci9@05GgOd&hCk2Cl z@=n|>wF7%nGe9(F7(D1;@SuaigUsOJ|I^-GK<9BRdjcQHjFOpcnVFeoW`=O$Bo4Ff zFewgm9F9W@GnmF(*C`Si)u z90kExj$FYgB^U)k?4EBF3ux`wF&Jk)(`X3Bb40H{p1={^3!KOi%}A3tBEe*i=w4uz z@H5jr@X-)N-xr>?&hGt3vw&8rA{e6tW5PD*6ihLncMRHKDn}%k#*r%+gEp{&F%Z!E z&4l-W!at)G$`}^Vx>y8bm0&Cc`NAV;ML8CN>89pboP`-2k)R+S>9)aGrym6T9jaql zK&x;Oj8lSf5TuzZ;~<#H5w*cAjz}<@BlnK%I0&L=Kr$zeV*#!CMKE3o#zQd2eBSX8 z%;ks#^Ee`b97zKEEM$Dt4=!LV@b`|5X94XnL@+@KCO}|&;sglho0=1F78Y>i_Jawk zA53u0f_(4X1QyVKMg$X;V4`Y+i4ZI_H77!_h$FWRCPHA_U?K$RuhX@W?ny>HaUu(7 z_auTzN-zlmI~FEEu-Md`1i=!H+%}k`+F(+27G9*W5IkcAlUP7|H4#i!g2@mpHB}}< zu#6+>2g^Bf1(PA5XH+yFOoqUG_a@&9oXi5+8H!+v5=?<$g{d+Hf|VSRU=>FskR#om zI0b^(*YQkY0qsLYFjWbrD#26;R-2kraTeBad9^MCiNyA7=4nH%^CTY=Z zvWBkh@(z<}JeH}qi(sY_%!D9!cm!EzLXd81&V*nGM_ggN9>u6#R3}1BABfN zvz1^r+F+llG8=8MpCeZ=Tg_*)A&Ay^0k1M=vw-Fe5zJA7IZ7}Gf&-@J90(3_@5-d<{umFM+rse{)!AXwXHduf*C>efc8jTB_ zvyeW-?t2%ofUYhgSf~UGm0%$Rr%cU-5S-@76)aR|VWHCo@@~ruSwPn^5iC-IMM|&; zf-|P(A_&fMu4_5$$aoEMfs&IYqEo2^K5CVhGNenu{Sg&yg!w41w(j ziy<&ioJ&~2ViwSKS_Dg!V2Khef#8CvxdeiX9Jzue>MSgQAT?TLcCxeb5*E;^Km<#b zU?~K)hcAWTlBu~Ag3BC{K#p{0<)uy=Bwb?#OIbi`5D_d>f@P`=mO*gE)LaI^RgT;? zSfy8j zlwge#tbrh>sksJ%TpYQAHL4%1i3Bm100|W*6W3)mk#1RSPNOvr3hy>fPO5-cj1{TonNdy~}U?bYVe%_4`6gD+C zq7900qqCD;r>aZ__M1SL3f1)G&%GX&93X%fL^7SKLa1Y49~ixO;sprom} z1%gr>xq>Z9uqA4PeKZ#2IoTE#(5_bmTa{p|5^RN_w5hojf-)Srf~`uh6@utB@~Qm3 znOj*vdu$PGQ-WxWjS&M+mv7%1m+cK=j?p2jRmx$7r}NV*scWIAt+~R zZik>eN3LMI5^Q(+!Jskr%CsGVfAT(9dia&Z-Y41N$?f#yc6oBUJ-I!e++I&^pC`B9 zlRMza9rWZ5d2)w6xg(z3QBUreCzs*L9rxr;cycE_xl^9pX;1EqCwJD9JLk!r_v9{k zau+?hOP<_iPwt8*cQqzQSF7|eCnG6cjihunlF~7fDwwg8j*(Q6BX=aFtC5uMjHDF) z`9|qHmZ`UkV22XyP=Xy0R5CSpKv0<@SFl3~b~v+%2zIbwrxNT`f}KjR6M`zH=1vHz za^wnjD#1<&qU)NxAMQ>T&`6dx*rf!!lwcPG)lAJ@5LD;L73@-iUEZ^>iv=`qh+wx8 z>{f!^5Y#X=cSBHT=`?_A0?%2x4E2wU-4n1B+mv66{lgeGt?$ zHTOYKpCebWPYL#U1^ZY)^Suc6L(sr{-u)0Xt}Y@tpach$-~ig7iK%%2ZP1h>S8zbJ!2z$}01N0^CW3=Xa1erKrpiGGnsY>L z(1Ifp$dPUv9E{FFW!iPh8t)(r=*lUALrQQ+wZS0>TAG@N&<3qIa@*jLYJ)=%L}Nkj zhaO@9U8hBGSP2e8(Arcv3_&tS)CO%hB7q#~w!vZNEXb=b4zqw(1tK`21V=(aub{1| zas+~Q9Fd?sMtyD#D zQVC8%VCUMC5cD=RPofR_a6|$*((MN)9f5pL_(>Mfx>y9Kl;9Kub}XENps%TU3W9zd zxovPtwZSO}qI<&0eE;JV3uqNCg40TH8iM|&%4rA&a71TeAV(ySBi%MQ4MFS*a~ z5Jx1CBVECTs0~KpZe(kFSNZ}AXlE#bi%M`20z1ktLU608c@cu!I3j@@=?X4FV4joJ zw9iK_vViuXBDkakmmsin;w1=fH#ILoFqk8^4KAsEaLMThG9O%G0quH4a9Ig1t2Vd{ z!5yaNWeD!%$ZdnmN^sdZ3-Y}5G7D&rErKgba778OKya6-c?E*IIdTP8l;8>k(TpUs z@)Z`)j$Q;;A-KnU-m4JU{&f|Cd--EDC*H@Adls%L!PTe@D$`0;Ua@`^f`9TpSV;eu z`(SaNT)Zcj$&<_M$z}26vU+maJh|+iTn6@U*F!9fD^#B7q#~3bI3Bp0e@xeq?6>U0p;k1vywi*D?|0RDztLK*mB&2%a}Jb3%~95ee*A$f^24P6(n^X4-zc_s_`! zx^jvjmlEVsZIBCs7fj7u5De$YZG&7&kSjV1>G%$uBX%_AVgX&JMUYzwazkKe``i$` zXlmw$;3bYoAV<1qA$N2ZaQ`EiZrdO?3usj!f;>u)2Lij&&I7^Are+=pUg3xYb}Zyk zZIB0o=(-@U6VAf|T7!rnuM*^iz<%Dm5WH$?=7r!jj$A=rCCKXtJN21jl`NKk?V2+aLZ{uyEkETHw32ojYbQ3(IeBCc-z#>2f;fWxo07t66A9P@(yMBSU_t>5#(2b{GmYR zgZvP@Yij0);608=VCRGUN{}Cd*gG)!SwJgQ5fo5@0;&xPKtRuw=*m<80{e`p0Ip27 z&lXUE0$xD@7SOs_1O=6#plXAH5R5QibwLQ;=g4h?f=W;jg4kz71zA9=a1j(zf0@`7SpokI_K^xe!TLgknOwA$?e993Cf$3KnGn?VdzXObLoXV4u4bgWz*h zvls+la6|$*(rtrc5SY=p(q5U0v4Hk!A}9{Qm*(>pS8Y%ng0J{vv}gL7BexBTt2QX^ z2;}}paTd_dPy{8Epo9{XfFRY>EP*!oh9g%{LJ3MZ{Xl+-ZwVIAK2!uHm7pX9_NreJ zf^SXDk`R2y5eei-_bil*1X!iX(}|KSpk1#BN-04p2y7281;O{GW+@1M;D`irq$?-| zL9{+dX=%qoDHhNkTLh(*ptKT{hTun2vor)hapVe0tFutr5hS;@tF+QApdGyk$|ymZ zP#{;PG7$W1YLpiCs#k{-@TgNj-~83_K#`(R1oR}%Yru(F<9IZv*< zCs)CftLVv9^5iOea#cLJs-9dmPp-NrSHqL5>B-gd{m} z$u;ui8hdh0Jh`TxTr*FuxhL1clWXb8wesXz$K+_GMEy@jQj!`;Nop)7VI=)(#!eDO z(r+BOV>wBUq@-v*+lL(&-~UMBu}r;P1Z9<=EChC*EDOQ!re;|P{@{oNa-=(-m30Ji z|D!AmXl#j~oD!5%vq?D!{xmhqLGTwx?rc&{wLv)uqP@Qe%CUe(vIxp6L3wo+%0uwC zsaYO^Q5?Bvp}Z25ciKSiLX~F$%^M=9pad1vS*QTPXj8KS1Y>>e zzyg}3L{L!)Dnek_xfLN8Yid@6U>rvzkR#oGP!R&N@8!LJMHbMUD1u5#P)W5xB?!iw znw21!z>(Vql~fy4a{7U+@hY)^W?&IiR)Wf^4Jt!0(bTLA!6c5{HmIxwm7O+7{@$+f zDzkv*dl6Jof+`T$yAM?$m~3iRfnW+pB(STCDoRkr5l9y! zjz}O!y8WQ0S5T7$v<4ADEhVT0f!#;df?%$xSqp-B9FahdbOp5_h<2Uw9XPdEKr0>* z)K-GpstsyGFyGXy4Z#AA+%~AK&O+^|AK*K&WGvKX0rhPW)KP*u5ZL*k4g?EL%{mY) z;>hg>b(Elva~6VScDGT71+CSq=(>=eVCTfT zETFZc2O-)C zKSn$6l^l^kj&yrseF&nSDEr>}ETDC<2pT9sgHRxIVgm?PnVJpI2CF$Dft`^Ws5WQ- zLG-LJDUWS~1}vaexCk05K|>{I2*Datvmpd)IdTOJm7rmC7W&e6kXXv_lI&xoLj5;TFp&b3V-*ko!pfnYO7B#VtvQ?oe)J2-OBLUYvy&7FQA zuf}T50@{a)poJ2&P-me91Yd>6(;BG-1UrqOg?eV(LJ3+pZ6L44YQX~9^@^aS610TC zUYS}#u*=kJ3BhiT+_TV930gXWL2c}Hp(P7wk1c{$O3+HRK`RJSO&hd=V2=^BQf<&m z30grA^~BVcR?vzCw4)b6Yb9t6f$d+dA=qnbwuWFIM{XOmR)W@1KllK+Z?*@Z@@Wa=kpc z-kw|^Pp+>g*Uyvd@5v4D4;x zm>kVZ)c<58C99E?jFDuoR>>Gi`_0%%#z?YH8j~@WA+)60{8kvc_u*0liv-+O91Ghm4@D+V{3q zg0|6Y61}>VXOp%ppph(sc1qArwLv=w4x5_oAUML2+Xn5FpdAF!-ao0heVubV7SOyQ zg7!+#9s)a~wuj)Tso5TaV;s3NYI`MU?>!6cSwORt2s$W12MFwStpfxZre+5Sj&tM+ zIw(O0rw!z}e+L%OoG5~hO3+cYK}QHqn3^3SILVPK=%@r8y=~Bu1vCSTppz1GQf<%) zf>WkuCkSeC`epSpKq0nPU!=&S^tA+V#oGX$qi&CU><;fMrsq&pvUcFuyl z{-ZMs=;|VZE=tfP6v$}o0>N2RvkL_0I3j`FadlB`&;^3Do^%gLejZd87SOd!1YMP& zE84*BV!A?b-qh?0!3B;;AV<1w(A8}Nz7yA#1$5;UK{qAnrp`h)2rinM-5|Kck$V=p zsW#~52xKgDV*y>KMbKRdxB{jlTX;{y}3HAx1e!IHKxuq}%#^P(9jl%Xet^ z;p((zlx=5SIHKxuq+7kOQ(e9h(kQJRDK=R6f$J-p{EX@Li{VT%FdzQoTP{@2|f0{-~bU)a#Gx2^_g!dw9l;`uRm9(6}MC$z|{w+>H|iIZws}E4s2cUZT`}!TI25@y++e`I< zTz#ObJ`mOOn|cFLy#PmU^?|DT!02noD{*Dk8OYUX7a`TJ;p*3*dO=g+8dNXD5zRP- zIil)vq&woSaaun83A+xwhO5(lMXF!R)vrbMk)|(Qi|R#8y=(Ec7v+em%aLxcyB5{W z>!8=#@qR5=r=5{hzmBV4hw5*e>er!qF;nk4R4>jERez6nlKkJ1K#p|3{_7!#-v3^ndtA=~+VP3t z1|_&b32uO(l&N_G1f@B01vjYPcY{}O0}E(>DS{i7;6^355rQ(N=8X^}apVeaRDv5L z!9JSvW!Als1+<$L!A(kVlM>tnL0MDtCJ4%LLR#B32uSFt|xARprWaH3j~!oB7q#~ z_QYG9vmkd`Z-IdBZ+)7deh%cnd&m3df`9#={5NzDV^H{&*!x@dzQ(Pd+-;uR?Vj9V zPwoy+?oLncE>G@mPwpO1?p{ysK2Pp`PwoLv?m|(g?a4jk$vx}IJ?F_iACseXD)m1ZNrTi#8l=YZAdDotpB;pe zRN0KALF!)hAdF@E&Z>i)k(4&yj^#l-mZ`Uk;8rELRS9l|po*z^D+E3uq*Z;C3arT?uZ7 zpoXb=I|Ma3as{_5!R-*3@Ad0o1-G++<_!@HR)WDwFc^YbrsiM>YIEcY1}nkfs15R9 zRoUMP2D5->DG}VE1a~OG9T3zpHSd6+E=R854kfrF65tioX{)T@4i?ayD1tkc;7%pD z6M}lC=A97K=g1Y@sRVaI5bf#ZRaSShfM#G3+@%C}DZyP3G%z*qf}kNsuHY^uxC;XF z9CwIqgS%Kj^Sub}R)V{g;BE*SnVNS)(3m4vaJLfN4MA!>eDCimE4Z5lbafHIJxXwo z65Inp6I1gZ2%2)_3hq&Yd!l}To*107f_qp%*D?{@s|5E#VAl-yLeR|AycdGz9Fahd zbXOPmMs08t#zH^4%ea>XbmbJmeM)ejYJ>YAXklvJ2SH1Y+%~vRwZVN+8^o+K?_&X7 zr$unT65Ou@_e0Ri)Vv>p)*QKl`<3ASs0|v^J4&Qqwm;+OeiqQGKm-pc!2?S000haV z<^vG4;m8#{pac&<5Z&vQXW0+1fYu-)cu)x*RDuT~XlrUd2thlJT)~4%@E`=qc+c;& zFKrt<$O2mNh~Oaz+MCb&P$-aly$?aqfj>t3-HsfQz~1Y9NC_T-Ao_`~PzZXPnnNMz!;yOyhAP3(=q%s~TymoA2SZsv>tYcMQ-Wbi zFbsmersgmR`f=n6hAF`?=PV@uVc(Hq7z=0>E`mpu;86(rn<|e&Fn}ZK2Lm}GfgI`f zgGV7Sug3q`w!xz;pf$e;9#ewHAh^aPz9FahdbOnz^{UG}Jz;*3f`7svI z4nqWwE5YMR@Hhn5o0^Z~EZo46D|lR;g~we1x548qp#6*po=}1(LV?UkPe5>^srdv1 zBhB5SC)BgxCzRj`2x9L(Ji!9mJ&E8+C3q47J0Cm=!A(Z+Bm_5eL~UT_gC~{XNeH6( zAeFx}2y73327=p7&1WDO%#qs@ zpHYHmAc(F^N%ib1?HLx(u2%%lD#5c5*irs01b3L4&q8n~MQ&!E;LRoDw_-!Cj{2a}eCkkt=vkwZU_dAX=$*v2E}i3us3#g6Easc?jB?5%)X< z_n4Z`LvSxgB(Up)=at}j2!g>_rLD4U@H_kPi}-K_r53hfhYH&C-;#j_pvAU zi6{4|C-<2rH`0^)+>`slll#(>`^uC1IwnW=!KnYqNJ>#7DFq|RJ|j)RNV?CAofM3u z`#GYKBuBclNs2q0l(Azug~u}Wb`iXw1TTaFxw5_h!2_n|3lKcWkvo=OP-FQ82x7m_ z?FAOl*b>2TB^Zu2uve?$5IkgR4u{}jjz}O!x@|Dr5y<;J4QBz3WD&fm1TUfu?6v(x z2p%ytUxZ)?M%^Ocm;yTP0d#zc!DFhAH1T@!YhtIcHXbBfM#G3ys8ARLhz)i@+t&R zaYQTar#T{l9O<^ftIk;n+S@jGl?624i{LdScr6sjXnYNVXH3o4&<4+PL;`zdeNDB& zYY>>x_?Vp!USk1WT}1G@61*x|WIH z4JCLZ6!Z>KOqDkvc!4823&S}gfgO!+s5W@R5e$0Eo`pA9Kvzx?yr~3lq7Cdk^Cko@ znwoE-4PN4i1ahR?25&+T`|8^_SwPom5xk`YZ>ctT3xbzT&9@+Ug(J5O-coJw76h^1 z^Z6DFXjLGBx0T@SP#`_=Z3td9HQ$EdHI7JNd*a(l@V0Xn

Zvw+qhB6vp$-cf>g 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 From c63da69e51b908ef578d2b153f19556bec5478ce Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 31 Jan 2024 10:51:53 +0800 Subject: [PATCH 48/64] =?UTF-8?q?1=E3=80=81=E5=AE=A1=E6=89=B9=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E6=95=B0=E6=8D=AE=E6=9C=AA=E6=B8=85=E7=90=86=202?= =?UTF-8?q?=E3=80=81=E5=9C=B0=E5=9B=BE=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=9C=B0=E5=9D=80=E6=9B=B4=E6=94=B9=203?= =?UTF-8?q?=E3=80=81=E6=B6=88=E9=98=B2=E7=BB=9F=E8=AE=A1=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=AF=A6=E6=83=85=E5=90=8E=EF=BC=8C=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/xgf/impl/XgfUserServiceImpl.java | 42 +++++++++++++++++-- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index f18af2b2..72ace485 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -455,34 +455,50 @@ public class XgfUserServiceImpl implements XgfUserService { case 0: if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_ZERO_USER_ID"))) { return "1"; + } else { + return "0"; } case 1: if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_ONE_USER_ID"))) { return "1"; + } else { + return "0"; } case 2: if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_TWO_USER_ID"))) { return "1"; + } else { + return "0"; } case 3: if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_THREE_USER_ID"))) { return "1"; + } else { + return "0"; } case 4: if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_FOUR_USER_ID"))) { return "1"; + } else { + return "0"; } case 5: if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_FIVE_USER_ID"))) { return "1"; + } else { + return "0"; } case 6: if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_SIX_USER_ID"))) { return "1"; + } else { + return "0"; } case 7: if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_SEVEN_USER_ID"))) { return "1"; + } else { + return "0"; } default: return "0"; @@ -514,6 +530,7 @@ public class XgfUserServiceImpl implements XgfUserService { throw new RuntimeException("请求失败"); } xgfUserMapper.edit(entity); + this.clearInfo(flows); xgfFlowsMapper.edit(flows); return "0"; } else { @@ -555,6 +572,7 @@ public class XgfUserServiceImpl implements XgfUserService { throw new RuntimeException("请求失败"); } xgfUserMapper.edit(entity); + this.clearInfo(flows); xgfFlowsMapper.edit(flows); return "0"; } else { @@ -600,6 +618,7 @@ public class XgfUserServiceImpl implements XgfUserService { entity.put("VALID_FLAG", "0"); entity.put("CHECK_STATUS", "-2"); PageData key = new PageData(); + xgfUserMapper.edit(entity); key.putAll(entity); key.put("USER_ID", condition.get("XGF_USER_ID")); key.put("STATUS", "1"); @@ -607,7 +626,7 @@ public class XgfUserServiceImpl implements XgfUserService { if (result == null || !"succeed".equals(result.get("result"))) { throw new RuntimeException("请求失败"); } - xgfUserMapper.edit(entity); + this.clearInfo(flows); xgfFlowsMapper.edit(flows); return "0"; } else { @@ -656,6 +675,7 @@ public class XgfUserServiceImpl implements XgfUserService { entity.put("STATUS", "0"); entity.put("VALID_FLAG", "0"); entity.put("CHECK_STATUS", "-2"); + xgfUserMapper.edit(entity); PageData key = new PageData(); key.putAll(entity); key.put("USER_ID", condition.get("XGF_USER_ID")); @@ -664,7 +684,7 @@ public class XgfUserServiceImpl implements XgfUserService { if (result == null || !"succeed".equals(result.get("result"))) { throw new RuntimeException("请求失败"); } - xgfUserMapper.edit(entity); + this.clearInfo(flows); xgfFlowsMapper.edit(flows); return "0"; } else { @@ -711,6 +731,7 @@ public class XgfUserServiceImpl implements XgfUserService { entity.put("STATUS", "0"); entity.put("VALID_FLAG", "0"); entity.put("CHECK_STATUS", "-2"); + xgfUserMapper.edit(entity); PageData key = new PageData(); key.putAll(entity); key.put("USER_ID", condition.get("XGF_USER_ID")); @@ -719,7 +740,7 @@ public class XgfUserServiceImpl implements XgfUserService { if (result == null || !"succeed".equals(result.get("result"))) { throw new RuntimeException("请求失败"); } - xgfUserMapper.edit(entity); + this.clearInfo(flows); xgfFlowsMapper.edit(flows); return "0"; } else { @@ -752,6 +773,11 @@ public class XgfUserServiceImpl implements XgfUserService { case 5: { condition.clear(); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); + flows.put("APPOINT_FIVE_CORP_ID", "1"); + flows.put("APPOINT_FIVE_CORP_NAME", "秦港股份有限公司"); + flows.put("APPOINT_FIVE_TIME", DateUtil.getTime()); + flows.put("APPOINT_FIVE_STATUS", info.getString("STATUS")); + flows.put("APPOINT_FIVE_OPINION", info.getString("OPINION")); PageData entity = xgfUserMapper.findById(condition); // 1、判断是否通过审核 if ("0".equals(info.getString("STATUS"))) { @@ -815,6 +841,15 @@ public class XgfUserServiceImpl implements XgfUserService { } } + private void clearInfo(PageData flow){ + flow.put("APPOINT_ONE_USER_ID", ""); + flow.put("APPOINT_TWO_USER_ID", ""); + flow.put("APPOINT_THREE_USER_ID", ""); + flow.put("APPOINT_FOUR_USER_ID", ""); + flow.put("APPOINT_FIVE_USER_ID", ""); + flow.put("APPOINT_SIX_USER_ID", ""); + flow.put("APPOINT_SEVEN_USER_ID", ""); + } private void saveLog(PageData info, String status, String endFlag) throws Exception { /* 保存审批记录 */ PageData condition = new PageData(); @@ -822,6 +857,7 @@ public class XgfUserServiceImpl implements XgfUserService { condition.put("FOREIGN_KEY", info.getString("FLOWS_ID")); condition.put("TYPE", "1"); condition.put("VALID_FLAG", "1"); + condition.put("END_FLAG", "0"); PageData flow = flowMapper.findByCondition(condition); if (flow == null || flow.size() == 0) { throw new RuntimeException("流程已被暂停，请联系管理员"); From 14d0c4df8e98fb876c6eaf52ebb991c4e2d3ce25 Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 31 Jan 2024 14:55:24 +0800 Subject: [PATCH 49/64] =?UTF-8?q?=E6=B6=88=E9=98=B2=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E8=A1=A8=E6=8A=A5=E9=94=99bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mybatis/datasource/system/UsersMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index c24965e2..e931bf02 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" JCR, CORPINFO_ID, CARDNO, - MKMJCARD. + MKMJCARD, ISDELETE From d61088c59e11e614760b6516d26528bbad5bf9cf Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 31 Jan 2024 21:17:48 +0800 Subject: [PATCH 50/64] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=95=B8=E6=93=9A?= =?UTF-8?q?=E6=9C=AA=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index 72ace485..de1d9450 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -188,6 +188,7 @@ public class XgfUserServiceImpl implements XgfUserService { flow.put("CREATOR_TIME", DateUtil.getTime()); flow.put("VALID_FLAG", "1"); flow.put("ISDELETE", "0"); + flow.put("END_FLAG","0"); flow.put("FOREIGN_KEY", x.getString("XGF_USER_ID")); flowMapper.save(flow); /* 保存审批流程明细信息 */ From 6aa940170a42ce333a29a127c244fb67fa8314c0 Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 31 Jan 2024 21:32:49 +0800 Subject: [PATCH 51/64] =?UTF-8?q?xml=E6=96=87=E4=BB=B6=E5=BF=98=E8=AE=B0?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mybatis/datasource/xgf/FlowMapper.xml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml b/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml index c9ca4481..1c1b56e7 100644 --- a/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml @@ -21,7 +21,8 @@ f.CREATOR_TIME, f.VALID_FLAG, f.FOREIGN_KEY, - f.ISDELETE + f.ISDELETE, + f.END_FLAG @@ -33,7 +34,8 @@ CREATOR_TIME, VALID_FLAG, FOREIGN_KEY, - ISDELETE + ISDELETE, + END_FLAG @@ -45,7 +47,8 @@ #{CREATOR_TIME}, #{VALID_FLAG}, #{FOREIGN_KEY}, - #{ISDELETE} + #{ISDELETE}, + #{END_FLAG} @@ -78,6 +81,7 @@ CREATOR_TIME = #{CREATOR_TIME}, VALID_FLAG = #{VALID_FLAG}, ISDELETE = #{ISDELETE}, + END_FLAG = #{END_FLAG}, FOREIGN_KEY = FOREIGN_KEY where FLOW_ID = #{FLOW_ID} From c056a35ab3954bc1f34f22c3206a355f9a6b13d5 Mon Sep 17 00:00:00 2001 From: liujun Date: Sun, 4 Feb 2024 11:03:13 +0800 Subject: [PATCH 52/64] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E7=AB=AF=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E5=A7=94=E6=89=98=E4=B9=A6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/xgf/impl/XgfUserServiceImpl.java | 2 ++ .../mybatis/datasource/xgf/FlowDetailMapper.xml | 12 ++++++++---- .../datasource/xgf/XgfUserDetailsMapper.xml | 16 ++++++++++++---- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index de1d9450..d9eab63a 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -203,6 +203,7 @@ public class XgfUserServiceImpl implements XgfUserService { flowDetail.put("APPROVER_TIME", DateUtil.getTime()); flowDetail.put("APPROVER_CORPINFO_ID", entity.getString("BELONG_TO_CORP")); flowDetail.put("APPROVER_CORPINFO_NAME", entity.getString("BELONG_TO_CORP_NAME")); + flowDetail.put("APPOINT_ANNEX", x.getString("ANNEX")); flowDetail.put("PASS_FLAG", "1"); flowDetail.put("END_FLAG", "0"); flowDetail.put("ISDELETE", "0"); @@ -226,6 +227,7 @@ public class XgfUserServiceImpl implements XgfUserService { nextNode.put("APPROVER_OPINION", ""); nextNode.put("APPROVER_CORPINFO_ID", entity.getString("BELONG_TO_CORP")); nextNode.put("APPROVER_CORPINFO_NAME", entity.getString("BELONG_TO_CORP_NAME")); + nextNode.put("APPOINT_ANNEX", x.getString("ANNEX")); flowDetailMapper.save(nextNode); currentNode.put("STEP_FLAG", "0"); flowDetailMapper.edit(currentNode); diff --git a/src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml b/src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml index 68702d01..5801dc27 100644 --- a/src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml @@ -29,7 +29,8 @@ f.ISDELETE, f.PARENT_ID, f.FOREIGN_KEY, - f.SORT + f.SORT, + f.APPOINT_ANNEX @@ -49,7 +50,8 @@ ISDELETE, PARENT_ID, FOREIGN_KEY, - SORT + SORT, + APPOINT_ANNEX @@ -69,7 +71,8 @@ #{ISDELETE}, #{PARENT_ID}, #{FOREIGN_KEY}, - #{SORT} + #{SORT}, + #{APPOINT_ANNEX} @@ -109,7 +112,8 @@ PARENT_ID = #{PARENT_ID}, FOREIGN_KEY = #{FOREIGN_KEY}, STEP_NAME = #{STEP_NAME}, - SORT = #{SORT} + SORT = #{SORT}, + APPOINT_ANNEX = #{APPOINT_ANNEX} where FLOW_DETAIL_ID = #{FLOW_DETAIL_ID} diff --git a/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml index 0c1343c9..7fb9f491 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml @@ -63,7 +63,9 @@ f.IS_BF, f.IS_SOCIAL, f.SOCIAL_NUMBER, - f.zzName + f.zzName, + f.ANNEX, + f.ATTORNEY @@ -122,7 +124,9 @@ IS_BF, IS_SOCIAL, SOCIAL_NUMBER, - zzName + zzName, + ANNEX, + ATTORNEY @@ -181,7 +185,9 @@ #{IS_BF}, #{IS_SOCIAL}, #{SOCIAL_NUMBER}, - #{zzName} + #{zzName}, + #{ANNEX}, + #{ATTORNEY} @@ -264,7 +270,9 @@ IS_BF = #{IS_BF}, IS_SOCIAL = #{IS_SOCIAL}, SOCIAL_NUMBER = #{SOCIAL_NUMBER}, - zzName = #{zzName} + zzName = #{zzName}, + ANNEX = #{ANNEX}, + ATTORNEY = #{ATTORNEY} where XGF_USER_DETAILS_ID = #{XGF_USER_DETAILS_ID} From 3db66181be483969435ae1f543266b3ce35cc0c3 Mon Sep 17 00:00:00 2001 From: liujun Date: Sun, 4 Feb 2024 11:19:41 +0800 Subject: [PATCH 53/64] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E7=AB=AF=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E5=A7=94=E6=89=98=E4=B9=A6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index d9eab63a..2b5935c4 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -106,6 +106,7 @@ public class XgfUserServiceImpl implements XgfUserService { } else { x.put("XGF_USER_ID", x.get("USER_ID")); x.put("XGF_USER_DETAILS_ID", x.get("USER_ID")); + x.put("XGF_USER_NAME", x.get("NAME")); x.put("IS_DELETE", "0"); x.put("CREATE_TIME", DateUtil.getTime()); x.put("OPERATOR_TIME", DateUtil.getTime()); From 404b7e5c86948d713ab6eb9f6b296f80d1136c8f Mon Sep 17 00:00:00 2001 From: liujun Date: Sun, 4 Feb 2024 13:41:57 +0800 Subject: [PATCH 54/64] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E7=AB=AF=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E5=A7=94=E6=89=98=E4=B9=A6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml index fd91dc5a..44a11118 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml @@ -296,7 +296,9 @@ b.IS_BF, b.SOCIAL_NUMBER, b.zzName, - b.POLITICAL_TIME + b.POLITICAL_TIME, + b.ANNEX, + b.ATTORNEY from xgf_user a left join xgf_user_details b on a.XGF_USER_ID = b.XGF_USER_ID where a.IS_DELETE = '0' From 5a810cba2f81ae3c69ad70214aaba3e94b2f1bf0 Mon Sep 17 00:00:00 2001 From: guoyuepeng <770272267@qq.com> Date: Sun, 4 Feb 2024 17:44:15 +0800 Subject: [PATCH 55/64] =?UTF-8?q?=E7=87=95=E5=A4=A7AI=E6=8A=A5=E8=AD=A6?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=9B=BE=E7=89=87=E5=AD=98=E5=82=A8=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zcloud/controller/keyProjects/AIWarningController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/zcloud/controller/keyProjects/AIWarningController.java b/src/main/java/com/zcloud/controller/keyProjects/AIWarningController.java index d92f570c..51b9fbbf 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/AIWarningController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/AIWarningController.java @@ -370,7 +370,7 @@ public class AIWarningController extends BaseController { if (Tools.notEmpty(jsonObject.get("IMG_PATH").toString())) { String imgName = this.get32UUID() + ".jpg"; String filePath = Const.FILEPATHAITP + "/" + DateUtil.getDays(); - Base64Utils.decodeToFile(Const.basePath + filePath + "/" + imgName, jsonObject.get("IMG_PATH").toString().replace("data:image/jpeg;base64,", "")); + Base64Utils.decodeToFile(Smb.basePath + filePath + "/" + imgName, jsonObject.get("IMG_PATH").toString().replace("data:image/jpeg;base64,", "")); pd.put("IMG_PATH", filePath + "/" + imgName); //报警图片（路径） } else { map.put("returnCode", "1001"); //缺少同步信息 From ee047f2beea419e7837fd5d91c436f35e7bfb7fe Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 21 Feb 2024 10:20:27 +0800 Subject: [PATCH 56/64] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E7=9A=84smb=E7=A0=96=E6=8D=A296=E6=9C=8D=E5=8A=A1=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 53082d08..669be795 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -64,11 +64,11 @@ spring.main.banner-mode=off preventionxgf.api.url=https://qgxgf.qhdsafety.com/qa-prevention-xgf/ qa-regulatory-gwj.api.url=http://192.168.0.31:8992/qa-regulatory-gwj/ #????? -smb.host=39.103.224.166 +smb.host=39.101.130.96 smb.port=22 smb.user=root smb.password=Zcloud@zcloud88888 -smb.basePath=/mnt/qgfile/file/ +smb.basePath=/mnt/wwag/file/ #Mq\u914D\u7F6E rocketmq.consumer.group2=edu-admin-edit From c45a96a34ec346258eb9d88f7478f74e245b8e8f Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 21 Feb 2024 11:25:48 +0800 Subject: [PATCH 57/64] =?UTF-8?q?1=E3=80=81=E6=89=BF=E8=AF=BA=E4=B9=A6?= =?UTF-8?q?=E3=80=81=E5=A7=94=E6=89=98=E4=B9=A6=E8=BD=AC=E5=8F=98=E5=BF=85?= =?UTF-8?q?=E4=BC=A0=202=E3=80=81bug=E4=BF=AE=E6=94=B9=EF=BC=88=E9=9B=86?= =?UTF-8?q?=E5=9B=A2=E5=8D=95=E4=BD=8D=E6=9F=A5=E7=9C=8B=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=E5=BD=92=E5=B1=9E=E8=87=AA=E5=B7=B1=E7=9A=84=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=96=B9=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/controller/xgf/XgfCorpController.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java b/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java index d3e7835d..df71617d 100644 --- a/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java +++ b/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java @@ -42,13 +42,17 @@ public class XgfCorpController extends BaseController { public Object getCorpInfoList(Page page) throws Exception { PageData pd = new PageData(); pd = this.getPageData(); - pd.put("SUPERVISE_CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - if (Jurisdiction.getIS_MAIN().equals("1")) { //主账号 - pd.put("SUPERVISE_DEPARTMENT_ID", ""); + if ("1e6dbbe16004402f8d2c0e52afd9a676,3a854eefa7894e06aaa1a2611bca80f6,020578a4c1f04bc692ee25145c2efbe5,90966974de3c4b83aca6f8fd6432d5c2".contains(Jurisdiction.getDEPARTMENT_ID())) { + pd.put("CORP_INFO_ID", Jurisdiction.getCORPINFO_ID()); } else { - pd.put("SUPERVISE_DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID()); + pd.put("SUPERVISE_CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + if (Jurisdiction.getIS_MAIN().equals("1")) { //主账号 + pd.put("SUPERVISE_DEPARTMENT_ID", ""); + } else { + pd.put("SUPERVISE_DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID()); + } } - Map result = HttpClientService.doPost(url + "/api/corpinfo/list", pd); + Map result = HttpClientService.doPost(url + "/api/corpinfo/JiTuanTeShulist", pd); return result; } From 87b251bc69074d3141e7d19d06275d3a5efd54ad Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 21 Feb 2024 17:16:12 +0800 Subject: [PATCH 58/64] =?UTF-8?q?1=E3=80=81=E6=89=BF=E8=AF=BA=E4=B9=A6?= =?UTF-8?q?=E9=94=99=E5=88=AB=E5=AD=97=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/zcloud/controller/xgf/XgfCorpController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java b/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java index df71617d..caa660ab 100644 --- a/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java +++ b/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java @@ -42,7 +42,7 @@ public class XgfCorpController extends BaseController { public Object getCorpInfoList(Page page) throws Exception { PageData pd = new PageData(); pd = this.getPageData(); - if ("1e6dbbe16004402f8d2c0e52afd9a676,3a854eefa7894e06aaa1a2611bca80f6,020578a4c1f04bc692ee25145c2efbe5,90966974de3c4b83aca6f8fd6432d5c2".contains(Jurisdiction.getDEPARTMENT_ID())) { + if ("1e6dbbe16004402f8d2c0e52afd9a676,3a854eefa7894e06aaa1a2611bca80f6,020578a4c1f04bc692ee25145c2efbe5,90966974de3c4b83aca6f8fd6432d5c2".contains(Jurisdiction.getCORPINFO_ID())) { pd.put("CORP_INFO_ID", Jurisdiction.getCORPINFO_ID()); } else { pd.put("SUPERVISE_CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); From a63e3883c8ce3be45b6be6c2509490c7d6aa2352 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Thu, 22 Feb 2024 17:57:45 +0800 Subject: [PATCH 59/64] =?UTF-8?q?Merge=20branch=20'2024=E5=B9=B42=E6=9C=88?= =?UTF-8?q?1=E6=97=A5V1.0.53'=20of=20E:\workspace\qa-prevention-gwj=20with?= =?UTF-8?q?=20conflicts.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.properties | 51 +++++++++++++------ 1 file changed, 35 insertions(+), 16 deletions(-) diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 53082d08..2ccf5867 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -1,5 +1,3 @@ - - datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no1.username=root @@ -60,9 +58,8 @@ spring.main.banner-mode=off #preventionxgf.api.url=http://192.168.0.79:8088 # #qa-regulatory-gwj.api.url=http://192.168.0.79:8008 - preventionxgf.api.url=https://qgxgf.qhdsafety.com/qa-prevention-xgf/ -qa-regulatory-gwj.api.url=http://192.168.0.31:8992/qa-regulatory-gwj/ +qa-regulatory-gwj.api.url=https://qgjg.qhdsafety.com/qa-regulatory-gwj/ #????? smb.host=39.103.224.166 smb.port=22 @@ -74,8 +71,8 @@ smb.basePath=/mnt/qgfile/file/ rocketmq.consumer.group2=edu-admin-edit rocketmq.consumer.group1=edu-admin-add #rocketmq.name-server=10.0.140.141:9876 -#rocketmq.name-server=192.168.0.70:9876 -rocketmq.name-server=172.24.151.16:9876 +rocketmq.name-server=192.168.0.70:9876 +#rocketmq.name-server=172.24.151.16:9876 rocketmq.producer.group=libmiddle rocketmq.producer.send-message-timeout=3000 rocketmq.producer.compress-message-body-threshold=4096 @@ -90,16 +87,38 @@ mq.topic.eightWork=eightWork mq.group.info=scheduled_tasks mq.group.eightWork=scheduled_tasks_eightWork -http.file.url=https://qgqy.qhdsafety.com/file/ - - -#数据同步topic -mq.gwj.data.topic=czks_qy_docking -mq.gwj.file.topic=czks_qy_dockingPicture -#港务局文件服务器前缀 -baseimgpath=https://qgqy.qhdsafety.com/file/ - -cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd corp.default.pic-path=https://qgqy.qhdsafety.com/ corp.default.back-end-path=https://qgqy.qhdsafety.com/file/ + + +#用户标识 +# 沧州矿石 +czks-useridentity=CZKS +czks-baseimgpath=https://wwag.qhdsafety.com/file/ +czks-backendaddr=http://192.168.0.79:8091/ +# 港务局 +gwj-useridentity=GWJ +gwj-baseimgpath=https://qgqy.qhdsafety.com/file/ +gwj-backendaddr=http://192.168.0.31:8991/qa-prevention-gwj/ +# ?????? +http.file.url=https://qgqy.qhdsafety.com/file/ +perLoc.url=http://192.168.210.32:8084 +perLoc.userName=qaaqadmin +perLoc.pwd=Cfd2023@ +baseimgpath =http://192.168.192.201:8991/file/ + +mq.csy.data.topic=csy_docking +mq.csy.data.group=scheduled_tasks_csy_docking +mq.csy.file.topic=csy_dockingPicture +mq.csy.file.group=scheduled_tasks_csy_dockingPicture + +mq.cmt.data.topic=cmt_docking +mq.cmt.data.group=scheduled_tasks_cmt_docking +mq.cmt.file.topic=cmt_dockingPicture +mq.cmt.file.group=scheduled_tasks_cmt_dockingPicture + +mq.czks.data.topic=czks_docking +mq.czks.data.group=scheduled_tasks_czks_docking +mq.czks.file.topic=czks_dockingPicture +mq.czks.file.group=scheduled_tasks_czks_dockingPicture From 6c16f4dc8e1a5bef7b5bbc7abbc26c74aaab9aae Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 26 Feb 2024 15:17:24 +0800 Subject: [PATCH 60/64] =?UTF-8?q?1=E3=80=81=E9=9B=86=E5=9B=A2=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E6=96=B0=E5=A2=9E=E4=B8=8A=E4=BC=A0=E6=89=BF=E8=AF=BA?= =?UTF-8?q?=E4=B9=A6=E5=8A=9F=E8=83=BD=202=E3=80=81=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=8D=95=E4=BC=A0=E5=8F=98=E5=A4=9A=E4=BC=A0=203=E3=80=81?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E4=B8=8B=E8=BD=BD=E9=99=84=E8=BF=91?= =?UTF-8?q?=E5=90=88=E9=9B=86=204=E3=80=81=E4=BF=AE=E6=94=B9=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E6=96=87=E4=BB=B6=E6=9C=AA=E6=B8=85=E7=A9=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/xgf/FlowTrainController.java | 37 ++++++ .../controller/xgf/XgfUserController.java | 17 +++ .../zcloud/service/xgf/XgfUserService.java | 3 + .../service/xgf/impl/XgfUserServiceImpl.java | 25 ++++ src/main/java/com/zcloud/util/Warden.java | 117 +++++++++++++++++- .../datasource/xgf/XgfUserDetailsMapper.xml | 14 ++- .../mybatis/datasource/xgf/XgfUserMapper.xml | 3 +- 7 files changed, 206 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java b/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java index 353793ec..b81c7e6e 100644 --- a/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java +++ b/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java @@ -164,4 +164,41 @@ public class FlowTrainController extends BaseController { map.put("result", "success"); return map; } + /** + * 获取流程节点名称 + * @date 2024-02-23 + * @author liu jun + */ + @RequestMapping(value = "/getPintName") + @ResponseBody + public Object getPintName() throws Exception { + PageData request = this.getPageData(); + if (StringUtils.isEmpty(request.getString("FLOWS_TYPE"))) + throw new Exception("FLOWS_TYPE不能为空"); + Map map = new HashMap(); + if ("1".equals(request.getString("FLOWS_TYPE"))) { + switch (request.getString("FLOWS_STEP")) { + case "0": + map.put("Department", "指定主管部门"); + map.put("User", "指定主管部门审批人"); + map.put("UploadFile", "承诺书"); + break; + case "1": + case "2": + map.put("Department", "指定监管部门"); + map.put("User", "指定监管部门审批人"); + break; + default: + throw new Exception("FLOWS_STEP不合法"); + } + } else{ + if (request.getString("FLOWS_STEP").equals("0")) { + map.put("Department", "监管部门"); + map.put("User", "监管部门审批人"); + } + } + + map.put("result", "success"); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/xgf/XgfUserController.java b/src/main/java/com/zcloud/controller/xgf/XgfUserController.java index 30e5c597..15352eb0 100644 --- a/src/main/java/com/zcloud/controller/xgf/XgfUserController.java +++ b/src/main/java/com/zcloud/controller/xgf/XgfUserController.java @@ -10,7 +10,9 @@ import com.zcloud.util.Jurisdiction; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.util.HashMap; @@ -57,6 +59,21 @@ public class XgfUserController extends BaseController { return response; } + + /** + * 人员信息审核 + */ + @RequestMapping(value = "/approvePlus") + @ResponseBody + public Object approvePlus(@RequestParam(value="chengNuoShu",required=false) MultipartFile[] chengNuoShu) throws Exception { + PageData request = this.getPageData(); + xgfUserService.approvePlus(request,chengNuoShu); + PageData response = new PageData(); + response.put("result", "success"); + response.put("data", request); + return response; + } + @RequestMapping(value = "/regulatoryUserList") @ResponseBody public Object regulatoryUserList() throws Exception{ diff --git a/src/main/java/com/zcloud/service/xgf/XgfUserService.java b/src/main/java/com/zcloud/service/xgf/XgfUserService.java index eb0c20a5..75b28f95 100644 --- a/src/main/java/com/zcloud/service/xgf/XgfUserService.java +++ b/src/main/java/com/zcloud/service/xgf/XgfUserService.java @@ -2,6 +2,7 @@ package com.zcloud.service.xgf; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -30,4 +31,6 @@ public interface XgfUserService { Object getApproveInfo(PageData request); Object getFlowInfo(PageData request); + + void approvePlus(PageData request, MultipartFile[] chengNuoShu) throws Exception; } diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index 2b5935c4..1376e98e 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -11,6 +11,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.util.ArrayList; @@ -138,6 +139,9 @@ public class XgfUserServiceImpl implements XgfUserService { x.put("STUDY_STATUS", entity.getString("STUDY_STATUS")); xgfUserMapper.edit(x); + // 2024-02-26 created by liu jun 清空上传文件信息 + x.put("ATTORNEY", ""); + x.put("COMMITMENT_LETTER", ""); xgfUserDetailsMapper.edit(x); } @@ -291,6 +295,9 @@ public class XgfUserServiceImpl implements XgfUserService { condition.put("APPOINT_DEPARTMENT_NAME", request.getString("APPOINT_DEPARTMENT_NAME")); condition.put("APPOINT_USER_ID", request.getString("APPOINT_USER_ID")); condition.put("APPOINT_USER_NAME", request.getString("APPOINT_USER_NAME")); + if (request.get("APPOINT_ANNEX") != null) { + condition.put("APPOINT_ANNEX", request.getString("APPOINT_ANNEX")); + } condition.put("FLOWS_ID", x); // 保存审批记录 @@ -453,6 +460,15 @@ public class XgfUserServiceImpl implements XgfUserService { return info; } + @Override + @Transactional + public void approvePlus(PageData request, MultipartFile[] chengNuoShu) throws Exception { + if (chengNuoShu != null && chengNuoShu.length > 0) { + request.put("APPOINT_ANNEX", Warden.saveFile(Warden.createZip(chengNuoShu),Jurisdiction.getCORPINFO_ID())); + } + this.approve(request); + } + /* 获取当前用户是否有权限审批 */ private String getPower(PageData x) { switch (Integer.parseInt(x.get("CHECK_STEP").toString())) { @@ -549,6 +565,14 @@ public class XgfUserServiceImpl implements XgfUserService { condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData user = xgfUserMapper.findById(condition); user.put("CHECK_STEP", 1); + // created by liu jun 2024-02-26 如果有委托书则保存委托书 + if (StringUtils.isNotBlank(info.getString("APPOINT_ANNEX"))) { + condition.clear(); + condition.put("XGF_USER_DETAILS_ID", flows.getString("FLOWS_ID")); + PageData userInfo = xgfUserDetailsMapper.findById(condition); + userInfo.put("COMMITMENT_LETTER", info.getString("APPOINT_ANNEX")); + xgfUserDetailsMapper.edit(userInfo); + } xgfUserMapper.edit(user); return "0"; } @@ -881,6 +905,7 @@ public class XgfUserServiceImpl implements XgfUserService { nextNode.put("APPROVER_TIME", DateUtil.getTime()); nextNode.put("APPROVER_CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); nextNode.put("APPROVER_OPINION", info.get("OPINION")); + nextNode.put("APPOINT_ANNEX", info.getString("APPOINT_ANNEX")); if ("1".equals(Jurisdiction.getCORPINFO_ID())) { nextNode.put("APPROVER_CORPINFO_NAME", "秦皇岛股份有限公司"); } else { diff --git a/src/main/java/com/zcloud/util/Warden.java b/src/main/java/com/zcloud/util/Warden.java index 8f2b9c81..7163ff0a 100644 --- a/src/main/java/com/zcloud/util/Warden.java +++ b/src/main/java/com/zcloud/util/Warden.java @@ -5,24 +5,32 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload.FileItemFactory; +import org.apache.commons.fileupload.disk.DiskFileItemFactory; +import org.apache.commons.io.IOUtils; import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.util.EntityUtils; +import org.springframework.http.MediaType; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.commons.CommonsMultipartFile; import javax.servlet.http.HttpServletRequest; import java.io.*; import java.net.URL; import java.net.URLConnection; import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; public class Warden { @@ -294,5 +302,106 @@ public class Warden { } } + public static String saveFile(MultipartFile[] files, String number) throws Exception{ + if (files.length == 0) throw new RuntimeException("文件为空"); + MultipartFile file = files[0]; + String ffile = DateUtil.getDays(); + String fileName = get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(file, fileName, Const.FILEPATHFILE + number + "/" + ffile); + return Const.FILEPATHFILE + number + "/" + ffile + "/" + fileName; + } + + public static String saveFile(MultipartFile file, String CORPINFO_ID) throws Exception{ + MultipartFile[] files = new MultipartFile[1]; + files[0] = file; + return saveFile(files, CORPINFO_ID); + } + + /** + * 压缩文件 + */ + public static MultipartFile createZip(MultipartFile[] chenNuoShu) throws Exception{ + return zipFiles(convertToFile(chenNuoShu)); + } + + public static List convertToFile(MultipartFile[] files) throws Exception { + List lstFile = new ArrayList<>(); + if (files.length == 0) { + throw new RuntimeException("文件为空"); + } + for (MultipartFile file : files) { + if (file.equals("") || file.getSize() <= 0) { + continue; + } else { + InputStream ins; + ins = file.getInputStream(); + File toFile = new File(file.getOriginalFilename()); + inputStreamToFile(ins, toFile); + lstFile.add(toFile); + ins.close(); + } + } + return lstFile; + } + + /** + * 获取流文件 + * + * @param ins + * @param file + */ + public static void inputStreamToFile(InputStream ins, File file) { + try { + OutputStream os = Files.newOutputStream(file.toPath()); + int bytesRead = 0; + byte[] buffer = new byte[8192]; + while ((bytesRead = ins.read(buffer, 0, 8192)) != -1) { + os.write(buffer, 0, bytesRead); + } + os.close(); + ins.close(); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public static MultipartFile zipFiles(List srcFiles) throws IOException { + Date date = new Date(); + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String dxfFileName = formatter.format(date).replace(" ", "_").replace(":", "-"); + + FileInputStream fileInputStream; + ByteArrayOutputStream byteOutStream = new ByteArrayOutputStream(); + try (ZipOutputStream zipOut = new ZipOutputStream(byteOutStream)) { + + for (File file : srcFiles) { + fileInputStream = new FileInputStream(file); + ZipEntry zipEntry = new ZipEntry(file.getName()); + zipOut.putNextEntry(zipEntry); + int len; + byte[] buffer = new byte[1024]; + while ((len = fileInputStream.read(buffer)) > 0) { + zipOut.write(buffer, 0, len); + } + fileInputStream.close(); + } + zipOut.flush(); + zipOut.closeEntry(); + zipOut.close(); + + + InputStream inputStream = new ByteArrayInputStream(byteOutStream.toByteArray()); + + FileItemFactory factory = new DiskFileItemFactory(16, null); + FileItem item = factory.createItem("file", MediaType.MULTIPART_FORM_DATA_VALUE, true, LocalDateTime.now() + ".zip"); + OutputStream os = item.getOutputStream(); + IOUtils.copy(inputStream, os); + + return new CommonsMultipartFile(item); + } catch (IOException e) { + e.printStackTrace(); + } + throw new IOException("压缩文件失败"); + } } diff --git a/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml index 7fb9f491..ed640710 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml @@ -65,7 +65,8 @@ f.SOCIAL_NUMBER, f.zzName, f.ANNEX, - f.ATTORNEY + f.ATTORNEY, + f.COMMITMENT_LETTER @@ -126,7 +127,8 @@ SOCIAL_NUMBER, zzName, ANNEX, - ATTORNEY + ATTORNEY, + COMMITMENT_LETTER @@ -187,7 +189,8 @@ #{SOCIAL_NUMBER}, #{zzName}, #{ANNEX}, - #{ATTORNEY} + #{ATTORNEY}, + #{COMMITMENT_LETTER} @@ -272,7 +275,8 @@ SOCIAL_NUMBER = #{SOCIAL_NUMBER}, zzName = #{zzName}, ANNEX = #{ANNEX}, - ATTORNEY = #{ATTORNEY} + ATTORNEY = #{ATTORNEY}, + COMMITMENT_LETTER = #{COMMITMENT_LETTER} where XGF_USER_DETAILS_ID = #{XGF_USER_DETAILS_ID} @@ -285,7 +289,7 @@ f where - f.XFG_USER_DETAILS_ID = #{XFG_USER_DETAILS_ID} + f.XGF_USER_DETAILS_ID = #{XGF_USER_DETAILS_ID} diff --git a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml index 44a11118..2de37005 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml @@ -298,7 +298,8 @@ b.zzName, b.POLITICAL_TIME, b.ANNEX, - b.ATTORNEY + b.ATTORNEY, + b.COMMITMENT_LETTER from xgf_user a left join xgf_user_details b on a.XGF_USER_ID = b.XGF_USER_ID where a.IS_DELETE = '0' From 8174eac8d8a35e70487353514dc0d09cecb9a200 Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 26 Feb 2024 15:31:15 +0800 Subject: [PATCH 61/64] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/zcloud/util/Warden.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/zcloud/util/Warden.java b/src/main/java/com/zcloud/util/Warden.java index 7163ff0a..701953a5 100644 --- a/src/main/java/com/zcloud/util/Warden.java +++ b/src/main/java/com/zcloud/util/Warden.java @@ -384,6 +384,11 @@ public class Warden { zipOut.write(buffer, 0, len); } fileInputStream.close(); + // 删除文件 + boolean isDelete = file.delete(); + if (isDelete){ + System.out.println("删除文件成功"); + } } zipOut.flush(); zipOut.closeEntry(); From 67f30d793d9a0854d1b7eda1a76dc1b5296a7b20 Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 26 Feb 2024 18:26:23 +0800 Subject: [PATCH 62/64] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=8E=8B=E7=BC=A9?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/zcloud/util/Warden.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zcloud/util/Warden.java b/src/main/java/com/zcloud/util/Warden.java index 701953a5..eb23c46b 100644 --- a/src/main/java/com/zcloud/util/Warden.java +++ b/src/main/java/com/zcloud/util/Warden.java @@ -373,10 +373,15 @@ public class Warden { FileInputStream fileInputStream; ByteArrayOutputStream byteOutStream = new ByteArrayOutputStream(); try (ZipOutputStream zipOut = new ZipOutputStream(byteOutStream)) { - + String fileNames = ""; + Random random = new Random(); for (File file : srcFiles) { fileInputStream = new FileInputStream(file); - ZipEntry zipEntry = new ZipEntry(file.getName()); + String fileName = file.getName(); + if (fileNames.contains(fileName)){ + fileName = (random.nextInt(90000) + 10000) + fileName; + } + ZipEntry zipEntry = new ZipEntry(fileName); zipOut.putNextEntry(zipEntry); int len; byte[] buffer = new byte[1024]; From bbde8cdb2a12e6ddb11ccefd332cdec528c485c6 Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 27 Feb 2024 11:03:57 +0800 Subject: [PATCH 63/64] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/zcloud/util/Warden.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/zcloud/util/Warden.java b/src/main/java/com/zcloud/util/Warden.java index eb23c46b..902003c4 100644 --- a/src/main/java/com/zcloud/util/Warden.java +++ b/src/main/java/com/zcloud/util/Warden.java @@ -380,6 +380,8 @@ public class Warden { String fileName = file.getName(); if (fileNames.contains(fileName)){ fileName = (random.nextInt(90000) + 10000) + fileName; + } else { + fileNames = fileNames + fileName + ","; } ZipEntry zipEntry = new ZipEntry(fileName); zipOut.putNextEntry(zipEntry); From cd03aabe3016a19a44c0b6a4b953a3fd8795c20b Mon Sep 17 00:00:00 2001 From: guoyuepeng <770272267@qq.com> Date: Tue, 27 Feb 2024 16:34:20 +0800 Subject: [PATCH 64/64] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E7=9A=84?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E9=A3=8E=E5=90=91=E7=9B=91=E6=B5=8B=E7=AB=99?= =?UTF-8?q?sql=E4=B8=9A=E5=8A=A1=E9=80=9F=E5=BA=A6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/controller/map/MapController.java | 24 ++++++++++++++- .../dsno2/map/MeteorologicalinfoMapper.java | 3 ++ .../map/MeteorologicalinfoService.java | 5 +++- .../impl/MeteorologicalinfoServiceImpl.java | 30 ++++++++++++++++++- .../dsno2/map/MeteorologicalinfoMapper.xml | 21 ++++++++++++- 5 files changed, 79 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zcloud/controller/map/MapController.java b/src/main/java/com/zcloud/controller/map/MapController.java index 99296de5..24459ab8 100644 --- a/src/main/java/com/zcloud/controller/map/MapController.java +++ b/src/main/java/com/zcloud/controller/map/MapController.java @@ -983,5 +983,27 @@ public class MapController extends BaseController { r.put("pd", pd); return r; } - + /** + * 企业端地图优化 + * 原有的地图查询速度太慢,达到5s以上,通过索引的方式暂时无法解决,所有使用业务优化sql,提升速度 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/listbymeteorologicalByCorpinfo") + @ResponseBody + public Object listbymeteorologicalByCorpinfo() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + //根据条件增加参数或减少参数 都没有 直接返回空 + if (StringUtils.isBlank(pd.getString("CORPINFO_ID"))) { + map.put("result", errInfo); + return map; + } + pd = meteorologicalinfoService.listbymeteorologicalByCorpinfoId(pd); //列出meteorological列表 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/mapper/dsno2/map/MeteorologicalinfoMapper.java b/src/main/java/com/zcloud/mapper/dsno2/map/MeteorologicalinfoMapper.java index c51056b7..c85402d0 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/map/MeteorologicalinfoMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/map/MeteorologicalinfoMapper.java @@ -100,5 +100,8 @@ public interface MeteorologicalinfoMapper { * @return */ List tensList(PageData pd); + + PageData listbymeteorologicalByCodes(PageData pd); + } diff --git a/src/main/java/com/zcloud/service/map/MeteorologicalinfoService.java b/src/main/java/com/zcloud/service/map/MeteorologicalinfoService.java index 8b80b9d2..35f71254 100644 --- a/src/main/java/com/zcloud/service/map/MeteorologicalinfoService.java +++ b/src/main/java/com/zcloud/service/map/MeteorologicalinfoService.java @@ -98,6 +98,9 @@ public interface MeteorologicalinfoService { * @throws Exception */ Integer updateMeteorologicalinfo(PageData pageData); - + /**列表 + * @throws Exception + */ + public PageData listbymeteorologicalByCorpinfoId(PageData pd)throws Exception; } diff --git a/src/main/java/com/zcloud/service/map/impl/MeteorologicalinfoServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/MeteorologicalinfoServiceImpl.java index 42c149a5..df1a3c83 100644 --- a/src/main/java/com/zcloud/service/map/impl/MeteorologicalinfoServiceImpl.java +++ b/src/main/java/com/zcloud/service/map/impl/MeteorologicalinfoServiceImpl.java @@ -2,6 +2,7 @@ package com.zcloud.service.map.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.mapper.dsno2.map.MeteorologicalMapper; import com.zcloud.mapper.dsno2.map.MeteorologicalinfoMapper; import com.zcloud.service.map.DataDockingLogService; import com.zcloud.service.map.MeteorologicalinfoService; @@ -12,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -27,7 +29,8 @@ public class MeteorologicalinfoServiceImpl implements MeteorologicalinfoService @Autowired private MeteorologicalinfoMapper meteorologicalinfoMapper; - + @Autowired + private MeteorologicalMapper meteorologicalMapper; @Autowired private DataDockingLogService dataDockingLogService; @@ -218,5 +221,30 @@ public class MeteorologicalinfoServiceImpl implements MeteorologicalinfoService public Integer updateMeteorologicalinfo(PageData pageData) { return meteorologicalinfoMapper.updateMeteorologicalinfo(pageData); } + + /**列表 + * @throws Exception + */ + public PageData listbymeteorologicalByCorpinfoId(PageData pd)throws Exception{ + /** + * 暂时使用in优化速度 + * 1.获取这个企业下的所有天气站信息 + * 2.根据这些天气站的信息,获取最新的数据 + */ + pd.put("OUTSOURCED_ID",pd.getString("CORPINFO_ID")); + List getListByCorpinfoId = meteorologicalMapper.listAll(pd); + if(getListByCorpinfoId.size() > 0){ + String codes = ""; + for (PageData met : getListByCorpinfoId){ + codes += "'" + met.getString("CODE")+"',"; + } + System.out.println(); + codes = codes.substring(0,codes.length()-1); + pd.put("codes",codes); + return meteorologicalinfoMapper.listbymeteorologicalByCodes(pd); + } + + return null; + } } diff --git a/src/main/resources/mybatis/dsno2/map/MeteorologicalinfoMapper.xml b/src/main/resources/mybatis/dsno2/map/MeteorologicalinfoMapper.xml index 3a2e2c88..a2b3204c 100644 --- a/src/main/resources/mybatis/dsno2/map/MeteorologicalinfoMapper.xml +++ b/src/main/resources/mybatis/dsno2/map/MeteorologicalinfoMapper.xml @@ -510,5 +510,24 @@ where f.CODE = #{CODE} and ABS(TIMESTAMPDIFF(SECOND, f.OPERATTIME, #{OPERATTIME})) < 10; - +