From eb6f266815ee521a4e840fa7551dea0af7651ee4 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Sun, 23 Apr 2023 14:09:03 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E7=BA=A0=E6=AD=A3=20=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E6=A0=87=E5=87=86=20=E6=98=AF+3=E5=B9=B4=20=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E6=A0=87=E5=87=86+5=E5=B9=B4-Q/QCBFC-=20Q/FT=20X=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E6=A0=87=E5=87=86,=E5=85=B6=E4=BB=96=E4=B8=BA?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarBussStandAttrInfo.java | 7 ++- .../SarBussionessStandController.java | 6 ++ .../service/ISarBussionessStandService.java | 2 + .../impl/SarBussionessStandServiceImpl.java | 61 +++++++++++++++++++ .../src/main/resources/mysql/interfaceLog.sql | 7 +++ 5 files changed, 82 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfo.java index 798cd575..57ab9fe1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfo.java @@ -69,14 +69,19 @@ public class SarBussStandAttrInfo extends BaseEntity { private String glwj; @ApiModelProperty(value = "译文件") - @TableField("TRANSLATION") + @TableField(exist = false) private String translation; @ApiModelProperty(value = "原文件") @TableField("FBGBUSS") private String fbgbuss; + @TableField(exist = false) private String fbgbussNmae; + + @ApiModelProperty(value = "复审日期") + @TableField("FSRQBUSS") + private String fsrqBuss; // // @TableField("SVPPS") // private String svpps; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index 849fc1f6..66395fa6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -619,5 +619,11 @@ public class SarBussionessStandController extends BaseController ResponseMessage selectById(String id,String type); ResponseMessage selectByIdAtt(String id); + + ResponseMessage cleaningDataReview(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 574ff6f9..fe5ffcd6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -138,6 +138,7 @@ import java.sql.Clob; import java.sql.Connection; import java.text.DateFormat; import java.text.DecimalFormat; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -4472,6 +4473,66 @@ public class SarBussionessStandServiceImpl extends ServiceImpl objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.isNotNull("ISSUE_TIME"); + objectQueryWrapper.isNotNull("STAND_SORT"); + List sarBussionessStands = baseMapper.selectList(objectQueryWrapper); + if(sarBussionessStands.isEmpty()){ + return Result.error("无合法数据更正，发布日期或者标准编号不可为null"); + } + List sarBussStandAttrInfos = new ArrayList<>(); + for (SarBussionessStand data :sarBussionessStands){ + if(data!=null && StringUtils.isNotBlank(data.getIssueTime()) && StringUtils.isNotBlank(data.getStandSort())){ + //判断是技术标准还是产品标准 如果是技术标准 则2.发布日期和复审日期留一个（逻辑：产品标准经过3年需要复审，技术标准经过5年需要复审）。,其他为技术标准。（如遇新的产品标准编号规则应通知李经理补充。） + //-Q/QCBFC -Q/FT X产品标准 + if(data.getStandSort().equals("Q/QCBFC") || data.getStandSort().equals("Q/FT X") || data.getStandSort().equals("Q/FTX")){ + //产品标准三年复审 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + try { + Date parse = sdf.parse(data.getIssueTime()); + Calendar instance = Calendar.getInstance(); + instance.setTime(parse); + instance.add(Calendar.YEAR,3); + QueryWrapper sarBussStandAttrInfoQueryWrapper = new QueryWrapper<>(); + sarBussStandAttrInfoQueryWrapper.eq("STAND_ID",data.getId()); + SarBussStandAttrInfo sarBussStandAttrInfo = sarBussStandAttrInfoService.getOne(sarBussStandAttrInfoQueryWrapper); + if(sarBussStandAttrInfo!=null) { + sarBussStandAttrInfo.setFsrqBuss(sdf.format(instance.getTime())); + sarBussStandAttrInfos.add(sarBussStandAttrInfo); + } + } catch (ParseException e) { + e.printStackTrace(); + } + }else { + //技术标准五年复审 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + try { + Date parse = sdf.parse(data.getIssueTime()); + Calendar instance = Calendar.getInstance(); + instance.setTime(parse); + instance.add(Calendar.YEAR,5); + QueryWrapper sarBussStandAttrInfoQueryWrapper = new QueryWrapper<>(); + sarBussStandAttrInfoQueryWrapper.eq("STAND_ID",data.getId()); + SarBussStandAttrInfo sarBussStandAttrInfo = sarBussStandAttrInfoService.getOne(sarBussStandAttrInfoQueryWrapper); + if(sarBussStandAttrInfo!=null) { + sarBussStandAttrInfo.setFsrqBuss(sdf.format(instance.getTime())); + sarBussStandAttrInfos.add(sarBussStandAttrInfo); + } + } catch (ParseException e) { + e.printStackTrace(); + } + } + } + } + if(!sarBussStandAttrInfos.isEmpty()){ + sarBussStandAttrInfoService.updateBatchById(sarBussStandAttrInfos); + } + return Result.success(sarBussStandAttrInfos); + } + public String updateInfo(List asList,String standId,String attfId) { //重复的集合 List chongfu = new ArrayList<>(); diff --git a/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql b/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql index 710aba6a..49bf82e3 100644 --- a/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql +++ b/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql @@ -1,5 +1,12 @@ -- 福田 需要通过第三方调用的接口 +-- 2023-04-23 11:18 +-- 名称 纠正企业标准复审日期的数据 -Q/QCBFC -Q/FT X产品标准（发布日期和复审日期留一个（逻辑：产品标准经过3年需要复审，技术标准经过5年需要复审）。,其他为技术标准。（如遇新的产品标准编号规则应通知李经理补充。）） +-- 详情 +-- 路径 http://localhost:9090/api/lawss/sarBussionessStand/cleaningDataReview +-- 参数 +-- 类型 Get + -- 2023-04-18 15:22 -- 名称 通过pid删除OA待办任务 通用接口 -- 详情 From c7a8f0fc3371a349d8357869f210301805e8d601 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Sun, 23 Apr 2023 16:08:40 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9A=84=20=E5=A4=8D?= =?UTF-8?q?=E5=AE=A1=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarBussionessStandController.java | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index 66395fa6..47582d53 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -60,6 +60,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.*; import java.text.DateFormat; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; @@ -194,6 +195,44 @@ public class SarBussionessStandController extends BaseController objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("STAND_ID",sarBussionessStandEO.getId()); + List sarBussStandAttrInfos = sarBussStandAttrInfoDao.selectList(objectQueryWrapper); + if(!sarBussStandAttrInfos.isEmpty()){ + SarBussStandAttrInfo sarBussStandAttrInfo = new SarBussStandAttrInfo(); + sarBussStandAttrInfo.setId(sarBussStandAttrInfos.get(0).getId()); + //判断是技术标准还是产品标准 如果是技术标准 则2.发布日期和复审日期留一个（逻辑：产品标准经过3年需要复审，技术标准经过5年需要复审）。,其他为技术标准。（如遇新的产品标准编号规则应通知李经理补充。） + //-Q/QCBFC -Q/FT X产品标准 + if(sarBussionessStandEO!=null && StringUtils.isNotBlank(sarBussionessStandEO.getIssueTime()) && StringUtils.isNotBlank(sarBussionessStandEO.getStandSort())){ + if(sarBussionessStandEO.getStandSort().equals("Q/QCBFC") || sarBussionessStandEO.getStandSort().equals("Q/FT X") || sarBussionessStandEO.getStandSort().equals("Q/FTX")){ + //产品标准三年复审 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + try { + Date parse = sdf.parse(sarBussionessStandEO.getIssueTime()); + Calendar instance = Calendar.getInstance(); + instance.setTime(parse); + instance.add(Calendar.YEAR,3); + sarBussStandAttrInfo.setFsrqBuss(sdf.format(instance.getTime())); + sarBussStandAttrInfoDao.updateById(sarBussStandAttrInfo); + } catch (ParseException e) { + e.printStackTrace(); + } + }else { + //技术标准五年复审 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + try { + Date parse = sdf.parse(sarBussionessStandEO.getIssueTime()); + Calendar instance = Calendar.getInstance(); + instance.setTime(parse); + instance.add(Calendar.YEAR,5); + sarBussStandAttrInfo.setFsrqBuss(sdf.format(instance.getTime())); + sarBussStandAttrInfoDao.updateById(sarBussStandAttrInfo); + } catch (ParseException e) { + e.printStackTrace(); + } + } + } + } return Result.success("","修改成功",sarBussionessStandEO); } From a0faf3ff31235633dce0bd5ce0a24f1763b56209 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Sun, 23 Apr 2023 17:06:35 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=B5=81=E7=A8=8B=20=E5=A4=8D=E5=AE=A1?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E7=9A=84=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ActSarItemsBussEOController.java | 35 ++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java index b7628543..a2dfe0e1 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java @@ -9,6 +9,7 @@ import com.adc.da.workFlow.entity.GetQBZXDExcelDto; import com.adc.da.workFlow.service.ActSarItemsBussEOService; import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.net.URLEncoder; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -47,7 +49,38 @@ public class ActSarItemsBussEOController extends BaseController { @PostMapping("/processCreateBuss") public ResponseMessage processCreateBuss(String infoJson) throws Exception { if (StringUtils.isNotBlank(infoJson)) { - String bussId = actSarItemsEOService.processCreateBuss(infoJson); + JSONObject jsonObject = JSON.parseObject(infoJson); + if(jsonObject!=null){ + Object issueTime = jsonObject.get("issueTime"); + Object standSort = jsonObject.get("standSort"); + if(issueTime!=null && standSort!=null){ + String issueTimeStr =issueTime.toString(); + String standSortStr = standSort.toString(); + if(StringUtils.isNotBlank(issueTimeStr) && StringUtils.isNotBlank(standSortStr)){ + if(standSortStr.equals("Q/QCBFC") || standSortStr.equals("Q/FT X") || standSortStr.equals("Q/FTX")){ + //产品标准三年复审 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Date parse = sdf.parse(issueTimeStr); + Calendar instance = Calendar.getInstance(); + instance.setTime(parse); + instance.add(Calendar.YEAR,3); + jsonObject.put("FSRQBUSS",sdf.format(instance.getTime())); + + }else { + //技术标准五年复审 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Date parse = sdf.parse(issueTimeStr); + Calendar instance = Calendar.getInstance(); + instance.setTime(parse); + instance.add(Calendar.YEAR,5); + jsonObject.put("FSRQBUSS",sdf.format(instance.getTime())); + + } + } + } + } + String s = jsonObject.toJSONString(); + String bussId = actSarItemsEOService.processCreateBuss(s); return Result.success(bussId); } else { return Result.error("传入数据json不能为空"); From 369567886f35f3a04f8677c115bcfae9c78b5f13 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Sun, 23 Apr 2023 17:15:45 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E7=AB=8B=E9=A1=B9=E8=AE=A1=E5=88=92=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=20=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD=E7=9A=84=E4=BC=81?= =?UTF-8?q?=E6=A0=87=E7=B1=BB=E5=88=AB=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/slrs/processModel/exportWkExcel.java | 13 ++++++++----- .../service/impl/TsDicTypeServiceImpl.java | 1 + .../main/java/com/adc/da/sys/dao/DicTypeEODao.java | 2 ++ .../com/adc/da/sys/service/IDicTypeEOService.java | 1 + .../da/sys/service/impl/DicTypeEOServiceImpl.java | 5 +++++ .../mybatis/mapper/sys/DicTypeEOMapper.xml | 4 ++++ 6 files changed, 21 insertions(+), 5 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java index f246215b..baa858ea 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java @@ -7,6 +7,7 @@ import com.adc.da.slrs.processModel.entity.exportExcel; import com.adc.da.slrs.processModel.entity.importExcelDTO; import com.adc.da.slrs.processModel.service.impl.IExportServiceImpl; import com.adc.da.slrs.processModel.utils.ExcelExportUtilByWk; +import com.adc.da.slrs.tsDictionaryType.service.ITsDicTypeService; import com.adc.da.sys.service.IDicTypeEOService; import com.adc.da.util.exception.AdcDaBaseException; import com.adc.da.util.http.ResponseMessage; @@ -72,14 +73,16 @@ public class exportWkExcel { * 静态加载企标类别下拉框 * @return */ - private static Map getBussStandTypeData(){ + private Map getBussStandTypeData(){ Map resultMap = new HashMap<>(); List> bussStandTypeList = new ArrayList<>(); - char letter = 'A'; - for(letter = 'A'; letter <= 'Z'; ++letter){ + List dicTypeNameList = new ArrayList<>(); + String dicId = "NGETEMDJDI"; + dicTypeNameList = dicTypeEOService.selectByDicId(dicId); + for (String dicTypeName : dicTypeNameList){ Map typeMap = new HashMap<>(); - typeMap.put("label","Q/FT "+letter); - typeMap.put("value","Q/FT "+letter); + typeMap.put("label",dicTypeName); + typeMap.put("value",dicTypeName); bussStandTypeList.add(typeMap); } resultMap.put("BUSSSTANDCLASS",bussStandTypeList); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/impl/TsDicTypeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/impl/TsDicTypeServiceImpl.java index 7870f248..c55fb826 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/impl/TsDicTypeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/impl/TsDicTypeServiceImpl.java @@ -5,6 +5,7 @@ import com.adc.da.slrs.tsDictionaryType.dao.TsDicTypeDao; import com.adc.da.slrs.tsDictionaryType.entity.TsSearchMenu; import com.adc.da.slrs.tsDictionaryType.service.ITsDicTypeService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java index e45f277a..c2581979 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java @@ -92,4 +92,6 @@ public interface DicTypeEODao extends BaseMapper { List selectPidByCode(@Param("fileType") String fileType); List selectDic(String id); + + List selectByDicId(@Param("dicId") String dicId); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/IDicTypeEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/IDicTypeEOService.java index 0b1d5fc2..43bd3bd8 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/IDicTypeEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/IDicTypeEOService.java @@ -88,4 +88,5 @@ public interface IDicTypeEOService extends IService { public List> getDicTypeByParentCodes(String dicTypeCode); + List selectByDicId(String dicId); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicTypeEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicTypeEOServiceImpl.java index cf7a4b89..495403a3 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicTypeEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicTypeEOServiceImpl.java @@ -278,6 +278,11 @@ public class DicTypeEOServiceImpl extends ServiceImpl im return listMap; } + @Override + public List selectByDicId(String dicId) { + return dicTypeEODao.selectByDicId(dicId); + } + /** * @Author liwenxuan * @Description 用来企业大类判断新增是否重复 diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml index 74e4b2af..3778955d 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml @@ -649,4 +649,8 @@ WHERE DIC_ID = #{id} + + From abc0c63f83efe8620483519315daa0b2a03a59b3 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Sun, 23 Apr 2023 18:08:31 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=81=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/SarBussionessStandDao.java | 1 + .../impl/SarBussionessStandServiceImpl.java | 42 ++++++++++++++++++- .../SarBussionessStandMapper.xml | 4 ++ 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java index 4c88ae84..3efec211 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java @@ -130,5 +130,6 @@ public interface SarBussionessStandDao extends BaseMapper { @Select("select * from sar") String setDtqbbhbuss(String dtqbbhbuss); + String selectByStandCode(String standCode); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index fe5ffcd6..9877e2ef 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -2834,13 +2834,14 @@ public class SarBussionessStandServiceImpl extends ServiceImplqueryWrapper = new QueryWrapper<>(); queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode()) .eq(standName != null,"STAND_NAME",standName); List list = iSarBussionessStandService.list(queryWrapper); Integer valIdFlag = 0; for (SarBussionessStand stand :list){ - if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){ + if ((list.size() >=1 && stand.getId().equals(id))){ valIdFlag = stand.getValidFlag(); if (valIdFlag == 0){ logger.info("企标标准号"+ sarBussionessStand.getStandCode() +"或企标名称"+ sarBussionessStand.getStandName() +"已存在"); @@ -4648,6 +4649,45 @@ public class SarBussionessStandServiceImpl extends ServiceImpl sarStandAttrMap = JSONObject.fromObject(sarStandAttrEOStr); + sarStandAttrMap.put("FSRQBUSS",sdf.format(instance.getTime())); + sarBussionessStandEO.setSarStandAttrEOStr(sarStandAttrMap.toString()); + } + } catch (ParseException e) { + e.printStackTrace(); + } + }else { + //技术标准五年复审 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + try { + Date parse = sdf.parse(sarBussionessStandEO.getIssueTime()); + Calendar instance = Calendar.getInstance(); + instance.setTime(parse); + instance.add(Calendar.YEAR,5); + //sarBussStandAttrInfo.setFsrqBuss(sdf.format(instance.getTime())); + String sarStandAttrEOStr = sarBussionessStandEO.getSarStandAttrEOStr(); + if(StringUtils.isNotBlank(sarStandAttrEOStr)){ + Map sarStandAttrMap = JSONObject.fromObject(sarStandAttrEOStr); + sarStandAttrMap.put("FSRQBUSS",sdf.format(instance.getTime())); + sarBussionessStandEO.setSarStandAttrEOStr(sarStandAttrMap.toString()); + } + } catch (ParseException e) { + e.printStackTrace(); + } + } + } createStandAttrInfo(sarBussionessStandEO,false); } // 增加关联事件 diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 250329c1..12622417 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -1250,6 +1250,10 @@ and smenu.MENU_ID = '44' + + update sar_buss_stand_attr_info ss set ss.FBGBUSS = #{strFile} where id = #{attfId} From 67baba6c3d7f99f8c856d727d2a68be2b0c44370 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Sun, 23 Apr 2023 18:21:34 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=A4=8D=E5=AE=A1=E6=B5=81=E7=A8=8B=20?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/FeignClient/workFlowFeignClient.java | 3 ++ .../workFlowFeignClientImpl.java | 5 +++ .../controller/WorkFlowController.java | 34 +++++++++++++++---- 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index 812ca558..ee799552 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -4,6 +4,7 @@ import com.adc.da.common.*; import com.adc.da.common.Category; import com.adc.da.common.Page; import com.adc.da.http.ResponseMessage; +import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; import com.adc.da.workFlow.entity.BusProcessEvaluationHis; import com.adc.da.workFlow.entity.BusProcessModelHis; import com.adc.da.workFlow.entity.ProcessRollBackEO; @@ -497,4 +498,6 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/updateBusProcessNew",method = RequestMethod.GET) ResponseMessage updateBusProcessNew(@RequestParam("id") String id, @RequestParam("mags") String mags); + @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/getSarBussionStandPageNo",method = RequestMethod.POST) + List getSarBussionStandPageNo(@RequestBody List rows); } diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index 0b7baaad..dda61982 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java @@ -6,6 +6,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.common.*; import com.adc.da.common.Page; +import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.service.IUserEOService; import com.adc.da.workFlow.entity.BusProcessEvaluationHis; @@ -460,4 +461,8 @@ public class workFlowFeignClientImpl { String mags = busMes.getJson(); return workFlowFeignClient.updateBusProcessNew(id,mags); } + + public List getSarBussionStandPageNo(@RequestBody List rows) { + return workFlowFeignClient.getSarBussionStandPageNo(rows); + } } diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index fabde358..a8cbc3dc 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -8,6 +8,8 @@ import com.adc.da.FeignClientImpl.workFlowFeignClientImpl; import com.adc.da.Timer.ProcessTimer; import com.adc.da.att.entity.AttFileEO; import com.adc.da.att.service.impl.AttFileEOServiceImpl; +import com.adc.da.base.page.Pager; +import com.adc.da.base.web.BaseController; import com.adc.da.common.*; import com.adc.da.exception.AdcDaBaseException; import com.adc.da.http.PageInfo; @@ -25,6 +27,9 @@ import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao; import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfo; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; +import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; +import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage; +import com.adc.da.slrs.sarBussionessStandState.service.ISarBussionessStandStateService; import com.adc.da.slrs.sarInstitution.dao.TsInstitutionDao; import com.adc.da.slrs.sarInstitution.entity.TsInstitution; import com.adc.da.slrs.sarUser.entity.TsUser; @@ -35,16 +40,14 @@ import com.adc.da.sys.entity.DicTypeEO; import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.service.IUserEOService; import com.adc.da.util.LoginUserUtil; -import com.adc.da.workFlow.dao.ExportExcelMapper; import com.adc.da.workFlow.entity.*; -import com.adc.da.workFlow.service.WorkFlowService; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import oracle.ucp.proxy.annotation.Post; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.formula.functions.T; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.util.IOUtils; import org.slf4j.Logger; @@ -52,7 +55,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; -import springfox.documentation.spring.web.json.Json; import sun.misc.BASE64Encoder; import javax.servlet.http.HttpServletRequest; @@ -60,7 +62,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.*; import java.net.HttpURLConnection; import java.net.URL; -import java.net.URLConnection; import java.net.URLEncoder; import java.text.SimpleDateFormat; import java.util.*; @@ -69,7 +70,7 @@ import java.util.stream.Collectors; @RestController @RequestMapping("/${restPath}/lawss/activiti") @Api(tags = "福田标准法规-工作流管理") -public class WorkFlowController { +public class WorkFlowController extends BaseController { private static final Logger logger = LoggerFactory.getLogger(WorkFlowController.class); @@ -118,6 +119,9 @@ public class WorkFlowController { @Autowired private ISarBussionessStandService sarBussionessStandEOService; + @Autowired + private ISarBussionessStandStateService bussionessStandStateService; + // @Autowired // private ExportExcelMapper exportExcelMapper; @@ -1298,4 +1302,22 @@ public class WorkFlowController { public ResponseMessage updateBusProcessNew(BusMes busMes) { return workFlowFeignClient.updateBusProcessNew(busMes); } + + /** + * 自定义分页复审流程查询列表 + * @param page 标准信息 + * @return + */ + @ApiOperation(value = "|SarBussionessStandState|自定义分页复审流程查询列表") + @GetMapping("/getSarBussionStandPageNo") + //@RequiresPermissions("lawss:sarBussionessStand:getSarBussionStandPage") + public ResponseMessage> getSarBussionStandPageNo(SarBussionessStandStatePage page) throws Exception { + List rows = bussionessStandStateService.getSarBussionessStandStatePageNo(page); + if(!rows.isEmpty()) { + List rowsList = workFlowFeignClient.getSarBussionStandPageNo(rows); + return Result.success(getPageInfo(page.getPager(), rowsList)); + } + return Result.success(getPageInfo(page.getPager(), rows)); + } + }