diff --git a/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java b/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java index 428670ac..398b9319 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java +++ b/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java @@ -186,8 +186,8 @@ public class ProcessTimer { } } -// @Scheduled(cron = "0 0 10 * * ? ")//每天十点执行 - @Scheduled(cron = "0 0 0/1 * * ? ")//每天十点执行 + @Scheduled(cron = "0 0 10 * * ? ")//每天十点执行 +// @Scheduled(cron = "0 0 0/1 * * ? ")//每天十点执行 // @Scheduled(cron = "*/40 * * * * ? ")//20s public void everyDayTenOlockScanSAM() { List busProcessNews=new ArrayList<>(); diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java index b12e5a5c..badbd890 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java @@ -161,7 +161,7 @@ public class ActSarItemsBussEOService { iSarBussionessStandService.attrInfoDetails(query); Map attrInfoMap = query.getAttrInfoMap(); if(attInfoMap!=null && !attInfoMap.isEmpty()){ - updateStandFileFieldData(attInfoMap,attrInfoMap); +// updateStandFileFieldData(attInfoMap,attrInfoMap); resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); sarBussionessStand.setSarStandAttrEOStr(resData); } @@ -192,7 +192,7 @@ public class ActSarItemsBussEOService { iSarBussionessStandService.attrInfoDetails(query); Map attrInfoMap = query.getAttrInfoMap(); if(attInfoMap!=null && !attInfoMap.isEmpty()){ - updateStandFileFieldData(attInfoMap,attrInfoMap); +// updateStandFileFieldData(attInfoMap,attrInfoMap); resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); sarBussionessStand.setSarStandAttrEOStr(resData); } 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 5c31e1f1..775607ae 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 @@ -473,15 +473,18 @@ public class SarBussionessStandServiceImpl extends ServiceImpl changeMap (SarBussionessStand sarStandardsInfoEO,Map map) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java index fcd93676..33e28534 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java @@ -123,6 +123,7 @@ public class SarPublicIdeaAllController extends BaseController Map map=new HashMap<>(); map.put("1","上报"); map.put("2","处理后上报"); + map.put("3","不上报"); String fileName = URLEncoder.encode(textName, "UTF-8").replaceAll("\\+", "%20"); response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); List data=new ArrayList<>(); @@ -156,6 +157,7 @@ public class SarPublicIdeaAllController extends BaseController .reason(sarPublicIdeaAll.getReason()) .userName(sarPublicIdeaAll.getUserName()) .deptName(sarPublicIdeaAll.getDeptName()) + .state(map.get(sarPublicIdeaAll.getState())) .cause(sarPublicIdeaAll.getCause()) .build(); standExcel.add(getExcelDto); @@ -169,9 +171,7 @@ public class SarPublicIdeaAllController extends BaseController headList.add(Lists.newArrayList("修改意见内容(包括理由或依据)","修改理由")); headList.add(Lists.newArrayList("提出部门")); headList.add(Lists.newArrayList("提出人")); - if ("1".equals(type)){ - headList.add(Lists.newArrayList("处理意见")); - } + headList.add(Lists.newArrayList("处理意见")); headList.add(Lists.newArrayList("原因")); if ("1".equals(type)) { EasyExcel.write(response.getOutputStream(), GetExcelDto2.class).head(headList).autoCloseStream(Boolean.FALSE).sheet("sheet1") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java index e447f216..0111de68 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java @@ -74,10 +74,10 @@ public class SarPublicIdeaController extends BaseController { // c.add(Calendar.DAY_OF_MONTH, 1);// 今天+1天 // sarPublicIdea.setStartTime(c.getTime()); // -// Calendar c2 = Calendar.getInstance(); -// c2.setTime(sarPublicIdea.getEndTime()); -// c2.add(Calendar.DAY_OF_MONTH, 2);// 今天+1天 -// sarPublicIdea.setEndTime(c2.getTime()); + Calendar c2 = Calendar.getInstance(); + c2.setTime(sarPublicIdea.getEndTime()); + c2.add(Calendar.DAY_OF_MONTH, 1);// 今天+1天 + sarPublicIdea.setEndTime(c2.getTime()); sarPublicIdeaService.save(sarPublicIdea); }catch(Exception e){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java index fc5a877b..505f964e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java @@ -38,6 +38,8 @@ public class GetExcelDto { // @ExcelProperty("提出人") private String userName; + private String state; + private String cause; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index 03be8495..f48a9162 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -59,7 +59,7 @@ public class SarStandardComplianceAssessResultController { if (eo.getStandApplicationType() == 1) { QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE"); + queryWrapper.select(" STAND_ID,ANY_VALUE(STAND_NUMBER) as STAND_NUMBER, STAND_NAME, STAND_TYPE"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { queryWrapper.like("STAND_NAME", eo.getStandName().trim()); } @@ -69,6 +69,7 @@ public class SarStandardComplianceAssessResultController { if (eo.getType() != null && !eo.getType().trim().equals("")) { queryWrapper.like("type", eo.getType().trim()); } + queryWrapper.groupBy("STAND_ID,STAND_NAME,STAND_TYPE"); IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); while (page.getRecords().remove(null)) ; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsValEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsValEO.java index 3825e89e..d2951f2a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsValEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsValEO.java @@ -3,6 +3,8 @@ package com.adc.da.slrs.standardSplit.entity; import com.adc.da.base.entity.BaseEntity; import com.adc.da.common.UploadFileInfo; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + import java.util.Date; import java.util.List; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarItemsCompareHisEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarItemsCompareHisEO.java index bd626150..1d490b88 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarItemsCompareHisEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarItemsCompareHisEO.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.standardSplit.entity; import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; @@ -11,6 +12,7 @@ import java.util.Date; * 日期： 2020-02-26
* 版权所有：版权归北京卡达克数据技术中心所有。
*/ +@TableName("sar_items_compare_his") public class SarItemsCompareHisEO extends BaseEntity { private String id; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java index fec300f5..01f0771e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java @@ -384,6 +384,7 @@ public class SarFileSplitMenuEOServiceImpl implements SarFileSplitMenuEOService sarFileSplitItemsEO.setCreationUser(LoginUserUtil.getUserId()); sarFileSplitItemsEO.setModifyUser(LoginUserUtil.getUserId()); sarFileSplitItemsEO.setEditFlag(String.valueOf(UUID.randomUUID())); + sarFileSplitItemsEO.setWorkFlowShow(sarFileSplitItemsEO.getWorkFlowShow()); result += sarFileSplitItemsEODao.insertSelective(sarFileSplitItemsEO); // SAR_FILE_ITEMS_VAL 添加数据， diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml index 3fe43621..94b5e2fa 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml @@ -11,7 +11,7 @@ INNER JOIN sar_public_idea_all on sar_public_idea_all.idea_id = sar_public_idea.id left join ts_user on ts_user.USID = sar_public_idea_all.user_id left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID - WHERE sar_public_idea_all.idea_id IS NOT NULL and sar_public_idea.uniques = #{unique} and sar_public_idea_all.wk_flag is null + WHERE sar_public_idea_all.idea_id IS NOT NULL and sar_public_idea.uniques = #{unique}