diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java index 2cbd6614..59408875 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java @@ -18,7 +18,7 @@ public class ActDefineStartMap { map.put("2","standardSurveyWorkFlow"); map.put("3","StandAskForOpinion"); map.put("4","standardregulatoryinventory"); - map.put("5","projectEvaluationProcess"); + map.put("5","projectEvaluationNewProcess"); map.put("6","Projectcomplianceassessment"); diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java index df9d072e..686b55f4 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java @@ -14,7 +14,7 @@ public class TableToExcel { public static Workbook createExcel(Map columnMap, List dataList, String sheelName, String fileName) { if(sheelName==null)sheelName="sheet1"; - + columnMap.put("a","序号"); int sheetRow=500; sheetRow=sheetRow<0?200:sheetRow; //第一步，创建一个webbook，对应一个excel文件，内存中sheetRow条记录后提交。 @@ -36,9 +36,10 @@ public class TableToExcel { Row neckRow = sheet.createRow(1); sheet.addMergedRegion(new CellRangeAddress(0,1,0,0)); sheet.addMergedRegion(new CellRangeAddress(0,1,1,1)); - sheet.addMergedRegion(new CellRangeAddress(0,0,2,4)); - sheet.addMergedRegion(new CellRangeAddress(0,1,5,5)); + sheet.addMergedRegion(new CellRangeAddress(0,1,2,2)); + sheet.addMergedRegion(new CellRangeAddress(0,0,3,5)); sheet.addMergedRegion(new CellRangeAddress(0,1,6,6)); + sheet.addMergedRegion(new CellRangeAddress(0,1,9,9)); sheet.addMergedRegion(new CellRangeAddress(0,1,7,7)); sheet.addMergedRegion(new CellRangeAddress(0,1,8,8)); //生成表头行 @@ -46,39 +47,51 @@ public class TableToExcel { for(String key:keys) { Cell hCell=headRow.createCell(j++); - if (j<3) + if (j<4) hCell.setCellValue(columnMap.get(key)); } if (null!=columnMap.get("commentText")) { - Cell hCellh = headRow.createCell(2); + Cell hCellh = headRow.createCell(3); hCellh.setCellValue("修改意见内容"); } + if (null!=columnMap.get("a")) { + Cell hCellh = headRow.createCell(0); + hCellh.setCellValue("序号"); + } + if (null!=columnMap.get("chapterNumber")) { + Cell hCellh = headRow.createCell(1); + hCellh.setCellValue("章条编号"); + } + if (null!=columnMap.get("chapterName")) { + Cell hCellh = headRow.createCell(2); + hCellh.setCellValue("章节名称"); + } if (null!=columnMap.get("department")) { - Cell hCell = headRow.createCell(5); + Cell hCell = headRow.createCell(6); hCell.setCellValue("提出部门"); } if (null!=columnMap.get("responUserName")) { - Cell hCell1 = headRow.createCell(6); + Cell hCell1 = headRow.createCell(7); hCell1.setCellValue("提出人"); } if (null!=columnMap.get("stateText")) { - Cell hCell2 = headRow.createCell(7); + Cell hCell2 = headRow.createCell(8); hCell2.setCellValue("处理意见"); } if (null!=columnMap.get("oldText")) { - Cell nCell = neckRow.createCell(2); + Cell nCell = neckRow.createCell(3); nCell.setCellValue("修改前"); } if (null!=columnMap.get("newText")) { - Cell nCell1 = neckRow.createCell(3); + Cell nCell1 = neckRow.createCell(4); nCell1.setCellValue("修改后"); } if (null!=columnMap.get("reason")) { - Cell nCell1 = neckRow.createCell(4); + Cell nCell1 = neckRow.createCell(5); nCell1.setCellValue("修改理由"); } if (null!=columnMap.get("cause")) { - Cell nCell1 = headRow.createCell(8); + Cell nCell1 = headRow.createCell(9); nCell1.setCellValue("原因"); } @@ -89,7 +102,8 @@ public class TableToExcel { T t=dataList.get(k); Row dataRow=sheet.createRow(c++); //循环取值进行数据填充 - int v=0; + int v=1; + dataRow.createCell(0).setCellValue(k+1); for(String key:keys) { if (!"commentText".equals(key)) { try { diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java index 57af35b3..a279368a 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java @@ -199,8 +199,11 @@ public class ActSarItemsEOService { List standlist = sarStandardsInfoEOService.selectStandardsByStandnumber(standnumber, sarStandardsInfoEO.getStandType()); if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "INLAND".equals(sarStandardsInfoEO.getStandType())) { sarStandardsInfoEO.setMenuId("64df1d5522bb49c09af2"); + sarStandardsInfoEO.setMenuIds("64df1d5522bb49c09af2,"+sarStandardsInfoEO.getMenuIds()); sarStandardsInfoEO.setCountry("CN"); } else if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "FOREIGN".equals(sarStandardsInfoEO.getStandType())) { + + sarStandardsInfoEO.setMenuIds("22179d54d4e640098e29,"+sarStandardsInfoEO.getMenuIds()); sarStandardsInfoEO.setMenuId("22179d54d4e640098e29"); } //此处判断是否是带入的标准 @@ -1109,6 +1112,7 @@ public class ActSarItemsEOService { case "standSort": sarStandardsInfoEO.setStandSort(valueStr); break; case "standState": sarStandardsInfoEO.setStandState(valueStr); break; case "menuId": sarStandardsInfoEO.setMenuId(valueStr); break; + case "menuIds": sarStandardsInfoEO.setMenuIds(valueStr); break; case "textStatus": sarStandardsInfoEO.setTextStatus(valueStr); break; case "synopsis": sarStandardsInfoEO.setSynopsis(valueStr); break; case "fileWord": diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 3cc10fc3..d2c92c47 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -110,8 +110,8 @@ public class WebMvcConfig implements WebMvcConfigurer { addInterceptor.excludePathPatterns("/api/lawss/activiti/loginMobile"); -// //测试接口使用 - addInterceptor.excludePathPatterns("/api/**"); +//// //测试接口使用 +// addInterceptor.excludePathPatterns("/api/**"); 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 6129a753..ed976a3f 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 @@ -22,6 +22,8 @@ import java.util.List; @Repository public interface SarBussionessStandDao extends BaseMapper { + List queryByBussStateSync(SarBussionessStand sarBussionessStand); + SarBussionessStand getStandInfoByReviseStatus(String reviseStatus); SarBussionessStand selectByPrimaryKey(String standId); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java index 2d6502fe..8d662298 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java @@ -124,6 +124,11 @@ public class SarBussionessStand extends BaseEntity { @TableField(exist = false) private String newStandSn; + /** + * 代替企标标准号 + */ + @TableField(exist = false) + private String DTQBBHBUSS; @TableField(exist = false) @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @@ -214,6 +219,17 @@ public class SarBussionessStand extends BaseEntity { @TableField(exist = false) private List attrInfoList = new ArrayList<>(); + /** + * 新增条件字段 + * @return + */ + @TableField(exist = false) + private String reviewTime; + @TableField(exist = false) + private String issueTimeStart; + @TableField(exist = false) + private String issueTimeEnd; + public static long getSerialVersionUID() { return serialVersionUID; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/controller/SarBussionessStandStateController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/controller/SarBussionessStandStateController.java new file mode 100644 index 00000000..03275114 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/controller/SarBussionessStandStateController.java @@ -0,0 +1,51 @@ +package com.adc.da.slrs.sarBussionessStandState.controller; + + +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage; +import com.adc.da.slrs.sarBussionessStandState.service.ISarBussionessStandStateService; +import com.adc.da.util.LoginUserUtil; +import com.adc.da.util.utils.StringUtils; +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +/** +*

+ * 企业标准信息复审表 前端控制器 + *

+* +* @author super_liu +* @since 2022-01-23 +*/ +@RestController +@Api(tags = "福田标准法规--企业复审信息") +@RequestMapping("/${restPath}/lawss/sarBussionessStandState") +public class SarBussionessStandStateController extends BaseController { + + @Autowired + private ISarBussionessStandStateService bussionessStandStateService; + + /** + * 自定义分页查询列表 + * @param page 标准信息 + * @return + */ + @ApiOperation(value = "|SarBussionessStandState|自定义分页查询列表") + @GetMapping("/getSarBussionStandPage") + //@RequiresPermissions("lawss:sarBussionessStand:getSarBussionStandPage") + public ResponseMessage> getSarBussionessStandStatePage(SarBussionessStandStatePage page) throws Exception { + List rows = bussionessStandStateService.getSarBussionessStandStatePage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/dao/SarBussionessStandStateDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/dao/SarBussionessStandStateDao.java new file mode 100644 index 00000000..fd0fa12e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/dao/SarBussionessStandStateDao.java @@ -0,0 +1,23 @@ +package com.adc.da.slrs.sarBussionessStandState.dao; + +import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; +import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +/** + *

+ * 企业标准信息复审表 Mapper 接口 + *

+ * + * @author super_liu + * @since 2022-01-23 + */ +public interface SarBussionessStandStateDao extends BaseMapper { + + List getBussionessStandStatePage(SarBussionessStandStatePage page); + + int getBussionessStandStateCount(SarBussionessStandStatePage page); + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandState.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandState.java new file mode 100644 index 00000000..d1c2adf4 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandState.java @@ -0,0 +1,90 @@ +package com.adc.da.slrs.sarBussionessStandState.entity; + +import com.adc.da.base.entity.BaseEntity; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * 企业标准信息复审表 + *

+ * + * @author super_liu + * @since 2022-01-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="SarBussionessStandState对象", description="企业标准信息复审表") +public class SarBussionessStandState extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键/企业标准信息主键") + @TableId(value = "ID", type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "企标ID") + @TableField("STAND_ID") + private String standId; + + @ApiModelProperty(value = "名称") + @TableField("STAND_NAME") + private String standName; + + @ApiModelProperty(value = "企标编号") + @TableField("STAND_CODE") + private String standCode; + + @ApiModelProperty(value = "复审时间") + @TableField("REVIEW_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String reviewTime; + + @ApiModelProperty(value = "发布日期") + @TableField("ISSUE_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String issueTime; + + @ApiModelProperty(value = "复审结果 1 修订、2 废止、3 继续有效") + @TableField("REVIEW_RESULTS") + private Integer reviewResults; + + @ApiModelProperty(value = "复审关联流程编号") + @TableField("REVIEW_PROCESS_NUM") + private String reviewProcessNum; + + @ApiModelProperty(value = "创建日期") + @TableField("CREATION_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private String creationTime; + + @ApiModelProperty(value = "更新日期") + @TableField("MODIFY_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private String modifyTime; + + @TableField("VALID_FLAG") + private Integer validFlag; + + @ApiModelProperty(value = "参数1") + @TableField("PARAM1") + private Integer param1; + + @ApiModelProperty(value = "参数2") + @TableField("PARAM2") + private String param2; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandStatePage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandStatePage.java new file mode 100644 index 00000000..3cca7a54 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandStatePage.java @@ -0,0 +1,74 @@ +package com.adc.da.slrs.sarBussionessStandState.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.adc.da.sys.common.BasePage; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.Date; + +/** + *

+ * 企业标准信息复审表 + *

+ * + * @author super_liu + * @since 2022-01-23 + */ +@Data +@ApiModel(value="SarBussionessStandStatePage对象", description="企业标准信息复审表分页") +public class SarBussionessStandStatePage extends BasePage { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键/企业标准信息主键") + private String id; + + @ApiModelProperty(value = "企标ID") + private String standId; + + @ApiModelProperty(value = "名称") + private String standName; + + @ApiModelProperty(value = "企标编号") + private String standCode; + + @ApiModelProperty(value = "复审时间") + private Date reviewTime; + + @ApiModelProperty(value = "发布日期") + private Date issueTime; + + @ApiModelProperty(value = "复审结果 1 修订、2 废止、3 继续有效") + private Integer reviewResults; + + @ApiModelProperty(value = "复审关联流程编号") + private String reviewProcessNum; + + @ApiModelProperty(value = "创建日期") + private Date creationTime; + + @ApiModelProperty(value = "更新日期") + private Date modifyTime; + + private Integer validFlag; + + @ApiModelProperty(value = "参数1") + private Integer param1; + + @ApiModelProperty(value = "参数2") + private String param2; + + private String reviewTimeStart; + private String reviewTimeEnd; + + private String issueTimeStart; + private String issueTimeEnd; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/ISarBussionessStandStateService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/ISarBussionessStandStateService.java new file mode 100644 index 00000000..d0656649 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/ISarBussionessStandStateService.java @@ -0,0 +1,21 @@ +package com.adc.da.slrs.sarBussionessStandState.service; + +import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; +import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 企业标准信息复审表 服务类 + *

+ * + * @author super_liu + * @since 2022-01-23 + */ +public interface ISarBussionessStandStateService extends IService { + + List getSarBussionessStandStatePage(SarBussionessStandStatePage page) throws Exception; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/impl/SarBussionessStandStateServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/impl/SarBussionessStandStateServiceImpl.java new file mode 100644 index 00000000..ce8fd653 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/impl/SarBussionessStandStateServiceImpl.java @@ -0,0 +1,30 @@ +package com.adc.da.slrs.sarBussionessStandState.service.impl; + +import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; +import com.adc.da.slrs.sarBussionessStandState.dao.SarBussionessStandStateDao; +import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage; +import com.adc.da.slrs.sarBussionessStandState.service.ISarBussionessStandStateService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 企业标准信息复审表 服务实现类 + *

+ * + * @author super_liu + * @since 2022-01-23 + */ +@Service +public class SarBussionessStandStateServiceImpl extends ServiceImpl implements ISarBussionessStandStateService { + + @Override + public List getSarBussionessStandStatePage(SarBussionessStandStatePage page) throws Exception{ + Integer rowCount = this.baseMapper.getBussionessStandStateCount(page); + page.getPager().setRowCount(rowCount); + List stateList = this.baseMapper.getBussionessStandStatePage(page); + return stateList; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/sync/StateSync.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/sync/StateSync.java new file mode 100644 index 00000000..732969b5 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/sync/StateSync.java @@ -0,0 +1,257 @@ +package com.adc.da.slrs.sarBussionessStandState.sync; + +import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao; +import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; +import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; +import com.adc.da.slrs.sarBussionessStandState.service.ISarBussionessStandStateService; +import com.adc.da.util.DateUtils; +import com.adc.da.utils.util.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import lombok.extern.slf4j.Slf4j; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.annotation.Async; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.*; +import java.util.stream.Collectors; + +/** + * @Description: TODO + * @author: super_liu + * @date: 2022年01月25日 3:34 + */ +@EnableScheduling +@Component +@Slf4j +public class StateSync { + Logger logger = LoggerFactory.getLogger(StateSync.class); + + @Autowired + private SarBussionessStandDao sarBussionessStandDao; + + @Autowired + private ISarBussionessStandStateService bussionessStandStateService; + + /** + * 根据配置文件设置是否开启定时器 + */ + + @Value("${isNotScheduled}") + private boolean isNotScheduled; //是否开启定时器 + + + // 月初 + @Scheduled(cron="0 0 1 1 * ?") +// @Scheduled(cron="*/5 * * * * ?") + @Async + public void StandScheduledJobMonthBegin(){ + if(isNotScheduled){ + try{ + Thread.sleep(2000); + logger.info("月初:"+Thread.currentThread().getName() + " cron=0 0 1 1 * ? --- " + new Date()+"---START-01"); + String nowFirst = DateUtil.firstOneDay(DateUtil.printDate(new Date())); + String nowFin = DateUtil.finOneDay(DateUtil.printDate(new Date())); + String nowFinByQuery = DateUtil.addDay(DateUtil.finOneDay(DateUtil.printDate(new Date())),1); + System.out.println("当前月第一日:"+nowFirst); + System.out.println("当前月最后一日:"+nowFin); + + SarBussionessStand stand = new SarBussionessStand(); + stand.setIssueTimeStart(nowFirst); + stand.setIssueTimeEnd(nowFin); + List standList = sarBussionessStandDao.queryByBussStateSync(stand); + if(!standList.isEmpty()){ + List filterList = new ArrayList<>(); + standList.forEach(sarBussionessStand -> { + SarBussionessStandState state = new SarBussionessStandState(); + state.setStandId(sarBussionessStand.getId()); + state.setStandCode(sarBussionessStand.getStandCode()); + state.setStandName(sarBussionessStand.getStandName()); + if(DateUtil.printToDate(sarBussionessStand.getIssueTime()) != null){ + state.setIssueTime(sarBussionessStand.getIssueTime()); + } + if(DateUtil.printToDate(sarBussionessStand.getReviewTime()) != null){ + state.setReviewTime(sarBussionessStand.getReviewTime()); + } + state.setCreationTime(DateUtil.printDateAll(new Date())); + state.setModifyTime(DateUtil.printDateAll(new Date())); + filterList.add(state); + }); + List insList = new ArrayList<>(); + List updList = new ArrayList<>(); + QueryWrapper wrapper = new QueryWrapper(); + wrapper.isNull("REVIEW_RESULTS"); + wrapper.between("REVIEW_TIME",nowFirst,nowFinByQuery); + List stateList = bussionessStandStateService.list(wrapper); + if(!stateList.isEmpty()){ + // 差集 (list1 - list2) 新增复审表 + List distinctByUniqueList = filterList.stream() + .filter(item -> !stateList.stream() + .map(SarBussionessStandState::getStandId) + .collect(Collectors.toList()) + .contains(item.getStandId())) + .collect(Collectors.toList()); + insList.addAll(distinctByUniqueList); + + // 交集 更新复审表 + List intersection = filterList.stream() + .filter(item -> stateList.stream() + .map(SarBussionessStandState::getStandId) + .collect(Collectors.toList()) + .contains(item.getStandId())) + .collect(Collectors.toList()); + + // jdk8 stream 更新集合批量赋值ID + List updSetList = intersection.stream() + .map(upObj -> stateList.stream() + .filter(stateQueryObj -> upObj.getStandId().equals(stateQueryObj.getStandId())) + .findFirst() + .map(stateQueryObj -> { + upObj.setId(stateQueryObj.getId()); + upObj.setModifyTime(DateUtil.printDateAll(new Date())); + return upObj; + }).orElse(null)) + .collect(Collectors.toList()); + updList.addAll(updSetList); + + }else { + // 新增复审表 + insList.addAll(filterList); + } + + // 复审表操作逻辑 新增 + if(!insList.isEmpty()){ + bussionessStandStateService.saveBatch(insList); + } + + // 复审表操作逻辑 更新 + if(!updList.isEmpty()){ +// List updListResult = updList.stream().peek(p -> p.setModifyTime(DateUtil.printDateAll(new Date()))).collect(Collectors.toList()); + bussionessStandStateService.updateBatchById(updList); + } + + } + + logger.info("月初:"+Thread.currentThread().getName() + " cron=0 0 1 1 * ? --- " + new Date()+"---End-01"); + }catch(Exception e){ + logger.info(e.getMessage()); + } + } + } + + // 月末 + @Scheduled(cron="0 0 1 28-31 * ?") +// @Scheduled(cron="*/5 * * * * ?") + @Async + public void StandScheduledJobMonthEnd(){ + if(isNotScheduled){ + try{ + Thread.sleep(2000); + // 判断当前日期是否为月末 + Date date = new Date(); + if(isLastDayOfMonth(date)){ + logger.info("月末:"+Thread.currentThread().getName() + " cron=0 0 1 28-31 * ? --- " + new Date()+"---START-01"); + String nextFirst = DateUtil.printDate(DateUtil.nextMonthFirstDate()); + String nextFin = DateUtil.finOneDay(DateUtil.printDate(DateUtil.nextMonthFirstDate())); + String nextFinByQuery = DateUtil.addDay(DateUtil.finOneDay(DateUtil.printDate(DateUtil.nextMonthFirstDate())),1); + System.out.println("下个月第一日:"+ nextFirst); + System.out.println("下个月最后一日:"+nextFin); + + SarBussionessStand stand = new SarBussionessStand(); + stand.setIssueTimeStart(nextFirst); + stand.setIssueTimeEnd(nextFin); + List standList = sarBussionessStandDao.queryByBussStateSync(stand); + if(!standList.isEmpty()){ + List filterList = new ArrayList<>(); + standList.forEach(sarBussionessStand -> { + SarBussionessStandState state = new SarBussionessStandState(); + state.setStandId(sarBussionessStand.getId()); + state.setStandCode(sarBussionessStand.getStandCode()); + state.setStandName(sarBussionessStand.getStandName()); + if(DateUtil.printToDate(sarBussionessStand.getIssueTime()) != null){ + state.setIssueTime(sarBussionessStand.getIssueTime()); + } + if(DateUtil.printToDate(sarBussionessStand.getReviewTime()) != null){ + state.setReviewTime(sarBussionessStand.getReviewTime()); + } + state.setCreationTime(DateUtil.printDateAll(new Date())); + state.setModifyTime(DateUtil.printDateAll(new Date())); + filterList.add(state); + }); + List insList = new ArrayList<>(); + List updList = new ArrayList<>(); + QueryWrapper wrapper = new QueryWrapper(); + wrapper.isNull("REVIEW_RESULTS"); + wrapper.between("REVIEW_TIME",nextFirst,nextFinByQuery); + List stateList = bussionessStandStateService.list(wrapper); + if(!stateList.isEmpty()){ + // 差集 (list1 - list2) 新增复审表 + List distinctByUniqueList = filterList.stream() + .filter(item -> !stateList.stream() + .map(SarBussionessStandState::getStandId) + .collect(Collectors.toList()) + .contains(item.getStandId())) + .collect(Collectors.toList()); + insList.addAll(distinctByUniqueList); + + // 交集 更新复审表 + List intersection = filterList.stream() + .filter(item -> stateList.stream() + .map(SarBussionessStandState::getStandId) + .collect(Collectors.toList()) + .contains(item.getStandId())) + .collect(Collectors.toList()); + // jdk8 stream 更新集合批量赋值ID + List updSetList = intersection.stream() + .map(upObj -> stateList.stream() + .filter(stateQueryObj -> upObj.getStandId().equals(stateQueryObj.getStandId())) + .findFirst() + .map(stateQueryObj -> { + upObj.setId(stateQueryObj.getId()); + upObj.setModifyTime(DateUtil.printDateAll(new Date())); + return upObj; + }).orElse(null)) + .collect(Collectors.toList()); + updList.addAll(updSetList); + }else { + // 新增复审表 + insList.addAll(filterList); + } + + // 复审表操作逻辑 新增 + if(!insList.isEmpty()){ + bussionessStandStateService.saveBatch(insList); + } + + // 复审表操作逻辑 更新 + if(!updList.isEmpty()){ +// List updListResult = updList.stream().peek(p -> p.setModifyTime(DateUtil.printDateAll(new Date()))).collect(Collectors.toList()); + bussionessStandStateService.updateBatchById(updList); + } + } + logger.info("月末:"+Thread.currentThread().getName() + " cron=0 0 1 28-31 * ? --- " + new Date()+"---End-01"); + }else { + logger.info("月末:"+Thread.currentThread().getName() + " cron=0 0 1 28-31 * ? --- " + new Date()+"当前日期不是最后一日---End-01"); + } + }catch(Exception e){ + logger.info(e.getMessage()); + } + } + } + + /** * 判断给定日期是否为月末的一天 * * @param date * @return true:是|false:不是 */ + public static boolean isLastDayOfMonth(Date date) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + calendar.set(Calendar.DATE, (calendar.get(Calendar.DATE) + 1)); + if (calendar.get(Calendar.DAY_OF_MONTH) == 1){ + return true; + } + return false; + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java index f909068e..4c2344b6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java @@ -172,13 +172,13 @@ public class QualityEvaluationServiceImpl extends ServiceImpl { return Result.success(tsUserIPage); } + /** + * 查询机构下所有的机构人员 + * @return ResponseMessage> + */ + @ApiOperation("查询机构的人员") + @PostMapping("/userUnderInstitution") + public ResponseMessage> userUnderInstitution(TsUser tsUser){ + + return Result.success(tsUserService.getAllUsers(tsUser)); + } + @ApiOperation("导入机构数据") @PostMapping("/import") public ResponseMessage importInstitution() throws Exception { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index 8b975cfa..b1988063 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -4,6 +4,8 @@ import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.*; import com.adc.da.slrs.sarLawsAttrDetailedList.service.ISarLawsAttrDetailedListService; import com.adc.da.slrs.sarLawsDetailedList.entity.TimeDto; +import com.adc.da.sys.common.SelectionResult; +import com.adc.da.sys.dao.DicTypeEODao; import com.adc.da.sys.service.IDicTypeEOService; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,6 +21,7 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** *

@@ -253,11 +256,25 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl> selectTimes(String id) { List standRegionalTimeDto= sarLawsAttrDetailedListDao.selectTimes(id); - Map map = iDicTypeEOService.getDicTypeListCode(); - List> arr = (List>) map.get("COUNTRY"); + +// 查询国家地区字典 + List dicTypeList = dicTypeEODao.getDicTypeByDicId("RFRFRFSCXVB"); + List> arr = dicTypeList.stream() + .map(item -> { + Map map = new HashMap<>(); + map.put("label", item.getLabel()); + map.put("value", item.getValue()); + return map; + }).collect(Collectors.toList()); +// Map map = iDicTypeEOService.getDicTypeListCode(); +// List> arr = (List>) map.get("COUNTRY"); for (StandRegionalTimeDto list1 : standRegionalTimeDto) { if (StringUtils.isNotBlank(list1.getCountry()) && list1.getCountry().contains(",")) { String[] split = list1.getCountry().split(","); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java index aaf58537..1f89c50b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java @@ -44,6 +44,19 @@ public class SarModelTreeController extends BaseController { return Result.success(tsResources); } + @ApiOperation("查询父所有资源") + @GetMapping("/listByType") + public ResponseMessage> getAllByType(String type){ +// List tsResources = iSarModuleTreeService.getAll(null); + SarModelTree rootData = new SarModelTree(); + rootData.setModelType(type); + rootData.setDelFlag("1"); + List tsResources = iSarModelTreeService.getAll(rootData); + return Result.success(tsResources); + } + + + @ApiOperation("根据父ID查询子所有资源") @GetMapping("/childByList") public ResponseMessage> childByList(SarModelTree parentTree){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java index b8e69de7..1b6b668f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java @@ -73,5 +73,25 @@ public class SarModelTree extends BaseEntity { @TableField(exist = false) private boolean leaf; + /** + * 模块类型 + * TRUCK 卡车类 + * CAR 乘用车类 + */ + @TableField("MODEL_TYPE") + private String modelType; + + /** + * 模块层级父级ID + * 为兼容之前的树结构逻辑，此处单独新增父级ID关联关系 + */ + @TableField("MODEL_PID") + private String modelPid; + + /** + * 模块数据层级关系 + */ + @TableField("MODEL_LEVEL") + private int modelLevel; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java index 0dd69717..ca1a9a16 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java @@ -5,6 +5,7 @@ import com.adc.da.slrs.sarModelTree.dao.SarModelTreeDao; import com.adc.da.slrs.sarModelTree.service.ISarModelTreeService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; import java.util.List; @@ -30,6 +31,10 @@ public class SarModelTreeServiceImpl extends ServiceImpl getAll(SarModelTree sarModelTree) { QueryWrapper tsResourceQueryWrapper=new QueryWrapper<>(); tsResourceQueryWrapper.isNull("PID"); + if(sarModelTree!=null && StringUtils.isNotBlank(sarModelTree.getModelType())){ + tsResourceQueryWrapper.eq("MODEL_TYPE",sarModelTree.getModelType()); + } + tsResourceQueryWrapper.eq("DEL_FLAG","1"); List list = this.baseMapper.selectList(tsResourceQueryWrapper); // for(SarModelTree tree:list){ // tree.setChildren(recursionGetChildren((tree))); @@ -59,6 +64,10 @@ public class SarModelTreeServiceImpl extends ServiceImpl children=this.baseMapper.selectList(sarMenuQueryWrapper); // for(SarModelTree sarMenu:children){ // sarMenu.setChildren(recursionGetChildren((sarMenu))); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java index 5fef685e..d0232950 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java @@ -20,7 +20,7 @@ import java.util.List; /** *

- * + * *

* * @author zyl @@ -65,7 +65,7 @@ public class TsResource extends BaseEntity { @ApiModelProperty(value = "排序序号") @TableField("DISPLAY_SEQ") private Integer displaySeq; - + @ApiModelProperty(value = "是否有效") @TableField("VALID_FLAG") @@ -100,4 +100,7 @@ public class TsResource extends BaseEntity { @TableField(exist=false) private String userId; + @TableField(exist = false) + private String isFlow; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java index cf74720e..95138325 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java @@ -224,6 +224,15 @@ public class TsResourceServiceImpl extends ServiceImpl children=dao.selectList(TsResourceQueryWrapper); + + /** + * 入库流程去除我的收藏 flow + */ + if ( tsResource.getIsFlow()!=null && "flow".equals(tsResource.getIsFlow())){ + children=children.stream() + .filter(item->!"我的收藏".equals(item.getMenuName())) + .collect(Collectors.toList()); + } resource.setChildren(recursionGetListChildrenStand((resource),(children))); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index f43caaab..f28a5e80 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -53,6 +53,14 @@ public class SarStandItemsController extends BaseController { } } + @ApiOperation(value = "分解单查询") + @GetMapping("/findItemById") + public ResponseMessage findItemById( @RequestParam("type") String type,@RequestParam("ids") String ids){ + String[] Sids=ids.split(","); + List ItemDto = ServiceImpl.findItemById(type,Sids); + return Result.success("200",ItemDto); + } + @ApiOperation(value = "项目评估流程分解单查询") @GetMapping("/workflowFindItems") public ResponseMessage workflowFindItems( @RequestParam("ids") String ids,@RequestParam("types") String types){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java index 1e19f4bf..19cc2890 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java @@ -63,6 +63,8 @@ public interface SarStandItemsDao extends BaseMapper { List selectAllItemsByIds(@Param("type") String type,@Param("ids") String[] ids); + List findItemById(@Param("type") String type,@Param("ids") String[] ids); + StandsTimeDto selectStandTime(String standId); List selectStandTimeAll(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index bdda5828..5a4693fe 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -220,6 +220,43 @@ public class SarStandItemsServiceImpl extends ServiceImpl findItemById(String type,String[] ids){ + List list=dao.findItemById(type,ids); + List res=new ArrayList<>(); + List chinese=new ArrayList<>(); + if (null == list || list.isEmpty()){ + return list; + }else { + List integerList=new ArrayList<>(); + Map> map=new HashMap<>(); + list.forEach(sarStandItemsDto -> { + int a= sarStandItemsDto.getItemsNum().indexOf("."); + String mark=sarStandItemsDto.getItemsNum(); + if (a>0){ + mark=mark.substring(0,a); + } + try { + if (null != map.get(Integer.valueOf(mark))) { + map.get(Integer.valueOf(mark)).add(sarStandItemsDto); + } else { + integerList.add(Integer.valueOf(mark)); + List middle = new ArrayList<>(); + middle.add(sarStandItemsDto); + map.put(Integer.valueOf(mark), middle); + } + }catch (Exception e){ + chinese.add(sarStandItemsDto); + } + }); + Collections.sort(integerList); + integerList.forEach(integer -> { + res.addAll(map.get(integer)); + }); + res.addAll(chinese); + return res; + } + } + public List querySarItemAndInterpretation(FindSarItemsPageReqDTO page){ //排序 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/dao/SarStandMenuDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/dao/SarStandMenuDao.java index 1c400103..ccda4edd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/dao/SarStandMenuDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/dao/SarStandMenuDao.java @@ -29,4 +29,6 @@ public interface SarStandMenuDao extends BaseMapper { List selectAllMenuByStandId(SarStandMenu sarStandMenuEO); + List getMenuByStandId(SarStandMenu sarStandMenu); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/entity/SarStandMenu.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/entity/SarStandMenu.java index b10b9a78..a1421881 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/entity/SarStandMenu.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/entity/SarStandMenu.java @@ -15,7 +15,7 @@ import org.springframework.data.annotation.Transient; /** *

- * + * *

* * @author super_liu @@ -58,4 +58,7 @@ public class SarStandMenu extends BaseEntity { private List menuIds; + @TableField(exist = false) + private String menuName; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index 0cd08aa5..77a5c481 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -325,35 +325,43 @@ public class SarStandProjectLibraryController extends BaseController managementHostList = new ArrayList<>(); List developmentHostList = new ArrayList<>(); List categoryList = new ArrayList<>(); + List statusList=new ArrayList<>(); for(SarStandProjectLibrary sarStandProjectLibrary1 : list){ - if(!managementHostList.contains(sarStandProjectLibrary1.getManagementHostName())){ + if(null!= sarStandProjectLibrary1.getManagementHostName()&& !"".equals(sarStandProjectLibrary1.getManagementHostName()) && !managementHostList.contains(sarStandProjectLibrary1.getManagementHostName())){ managementHostList.add(sarStandProjectLibrary1.getManagementHostName()); } - if(!developmentHostList.contains(sarStandProjectLibrary1.getDevelopmentHostName())){ + if(null!= sarStandProjectLibrary1.getDevelopmentHostName()&& !"".equals(sarStandProjectLibrary1.getDevelopmentHostName()) && !developmentHostList.contains(sarStandProjectLibrary1.getDevelopmentHostName())){ developmentHostList.add(sarStandProjectLibrary1.getDevelopmentHostName()); } - if(!categoryList.contains(sarStandProjectLibrary1.getCategoryName())){ + if(null!= sarStandProjectLibrary1.getCategoryName()&& !"".equals(sarStandProjectLibrary1.getCategoryName()) && !categoryList.contains(sarStandProjectLibrary1.getCategoryName())){ categoryList.add(sarStandProjectLibrary1.getCategoryName()); } + if (null!= sarStandProjectLibrary1.getProjectStatus()&& !"".equals(sarStandProjectLibrary1.getProjectStatus()) && !statusList.contains(sarStandProjectLibrary1.getProjectStatus())){ + statusList.add(sarStandProjectLibrary1.getProjectStatus()); + } } QuerySelectRspDTO querySelectRspDTO = QuerySelectRspDTO.builder() .managementHostList(managementHostList) .developmentHostList(developmentHostList) .categoryList(categoryList) + .statusList(statusList) .build(); return Result.success(querySelectRspDTO); } //标准评估流程 查询项目群接口 @GetMapping("/queryProjectGroup") @ApiOperation("查询项目群") - public ResponseMessage queryProjectGroup(SarStandProjectLibrary sarStandProjectLibrary){ - return Result.success( sarStandProjectLibraryService.queryProjectGroup(sarStandProjectLibrary)); + public ResponseMessage queryProjectGroup(@RequestParam(defaultValue = "1", value = "current")int current, + @RequestParam(defaultValue = "10", value = "PageSize") int pageSize, + SarStandProjectLibrary sarStandProjectLibrary){ + return Result.success( sarStandProjectLibraryService.queryProjectGroup(current,pageSize,sarStandProjectLibrary)); } //标准评估流程根据项目群查项目接口 @GetMapping("/queryProjects") @ApiOperation("查询项目群下的项目") - public ResponseMessage queryProjects(SarStandProjectLibrary sarStandProjectLibrary){ - return Result.success( sarStandProjectLibraryService.queryProjects(sarStandProjectLibrary)); + public ResponseMessage queryProjects(@RequestParam(defaultValue = "1", value = "current")int current, + @RequestParam(defaultValue = "10", value = "PageSize") int pageSize,SarStandProjectLibrary sarStandProjectLibrary){ + return Result.success( sarStandProjectLibraryService.queryProjects(current,pageSize,sarStandProjectLibrary)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java index ca7feae1..1693106b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java @@ -33,7 +33,9 @@ public interface SarStandProjectLibraryDao extends BaseMapper selectListByids(@Param("ids") List ids); - List queryProjectGroup(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary); + List queryProjectGroup(@Param("current")int current,@Param("size")int size,@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary); + Integer queryProjectGroupCount(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary); - List queryProjects(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary,@Param("groups")List strings); + List queryProjects(@Param("current")int current,@Param("size")int size,@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary,@Param("groups")List strings); + Integer queryProjectsCount(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary,@Param("groups")List strings); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/QuerySelectRspDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/QuerySelectRspDTO.java index 4c9a1e1d..4f316dbb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/QuerySelectRspDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/QuerySelectRspDTO.java @@ -14,4 +14,6 @@ public class QuerySelectRspDTO { private List developmentHostList; private List categoryList; + + private List statusList; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java index 72f916ab..84f5436d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java @@ -29,8 +29,8 @@ public interface SarStandProjectLibraryService { void batchInsertAdd(@Param("ids") List list); List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto,String standId); public Head AnalysisJsonAndStorage(String jsonStr); - public List queryProjectGroup(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary); + public IPage queryProjectGroup(@Param("current")int current,@Param("size")int size, @Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary); - public List queryProjects(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary); + public IPage queryProjects(@Param("current")int current,@Param("size")int size, @Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index f7ce0a56..e0b78e89 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonParser; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -127,12 +128,19 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryProjectGroup(SarStandProjectLibrary sarStandProjectLibrary) { - return sarStandProjectLibraryDao.queryProjectGroup(sarStandProjectLibrary); + public IPage queryProjectGroup(int current,int size,SarStandProjectLibrary sarStandProjectLibrary) { + List sarStandProjectLibraries=sarStandProjectLibraryDao.queryProjectGroup(current,size,sarStandProjectLibrary); + Integer total=sarStandProjectLibraryDao.queryProjectGroupCount(sarStandProjectLibrary); + Page page=new Page<>(); + page.setRecords(sarStandProjectLibraries); + page.setTotal(total); + page.setCurrent(current); + page.setSize(size); + return page; } @Override - public List queryProjects(SarStandProjectLibrary sarStandProjectLibrary) { + public IPage queryProjects(int current,int size, SarStandProjectLibrary sarStandProjectLibrary) { List ids=new ArrayList<>(); if (null!=sarStandProjectLibrary.getProjectGroup() && !"".equals(sarStandProjectLibrary.getProjectGroup())){ if (sarStandProjectLibrary.getProjectGroup().contains(",")){ @@ -141,7 +149,15 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl sarStandProjectLibraryIPage=new Page<>(); + List sarStandProjectLibraries=sarStandProjectLibraryDao.queryProjects(current,size,sarStandProjectLibrary,ids); + Integer total=sarStandProjectLibraryDao.queryProjectsCount(sarStandProjectLibrary,ids); + sarStandProjectLibraryIPage.setTotal(total); + sarStandProjectLibraryIPage.setCurrent(current); + sarStandProjectLibraryIPage.setSize(size); + sarStandProjectLibraryIPage.setRecords(sarStandProjectLibraries); + + return sarStandProjectLibraryIPage; } @Override diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index c670d718..6e51af8d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -14,6 +14,8 @@ import com.adc.da.http.Result; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; import com.adc.da.slrs.sarLawsInfo.service.ISarLawsInfoService; +import com.adc.da.slrs.sarStandMenu.dao.SarStandMenuDao; +import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu; import com.adc.da.slrs.sarStandardsInfo.entity.*; import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.util.LoginUserUtil; @@ -553,6 +555,46 @@ public class SarStandardsInfoController extends BaseController } + @ApiOperation(value = "在入库流程中配置单个标准的 体系目录 体系目录可以是多个") + @PostMapping("/saveStandardsMenuForFlow") + public ResponseMessage saveStandardsMenuForFlow(@RequestBody SarStandardsInfoEOPage standardsInfoEO) throws Exception { + boolean flag = false; + for (String id : Arrays.asList(standardsInfoEO.getMenuIds().split(","))) { + standardsInfoEO.setMenuId(id); + + try { + flag = sarStandardsInfoEOService.updateStandardsMenu(standardsInfoEO); + }catch (NullPointerException e){ + flag = sarStandardsInfoEOService.updateStandInfo(standardsInfoEO); + } + + if (!flag){ + break; + } + } + + + + if (flag){ + return Result.success("200","配置成功",true); + } + return Result.error("-1","配置失败"); + + } + + @Autowired + SarStandMenuDao sarStandMenuDao; + @ApiOperation(value = "查询标准所在的 体系目录") + @GetMapping("/getStandMenuId") + public ResponseMessage> getStandMenuId(SarStandMenu getStandId){ + + List sarStandMenus = sarStandMenuDao.getMenuByStandId(getStandId); + + return Result.success(sarStandMenus); + + } + + @ApiOperation(value = "|SarStandardsInfoEO|详情页面查询相近标准") @GetMapping("/selectCloseStand") //@RequiresPermissions("lawss:sarStandardsInfo:list") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java index cde2968f..ac30740c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java @@ -186,6 +186,9 @@ public class SarStandardsInfo extends BaseEntity { private String sarStandAttrEOStr; //新增修改时属性表信息 @TableField(exist = false) private String menuId; //目录ID + + @TableField(exist = false) + private String menuIds; //目录ID @TableField(exist = false) private int upReplaceNumFlag; //记录是否修改了替代文件号 @TableField(exist = false) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java index 62203ee5..9cac67eb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java @@ -103,4 +103,9 @@ public class SarStandardsInfoEOPage extends BasePage { * 日期范围查询发布日期结束 */ private String endIssueTime; + + /** + * 标准添加到体系中的id多个 + */ + private String menuIds; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 244fa967..55c15c85 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -814,13 +814,16 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl { */ List getUserAndPositionPage(@Param("start")Integer start, @Param("end")Integer end,@Param("TsUser") TsUser tsUser); + List userUnderInstitution(@Param("start")Integer start, @Param("end")Integer end,@Param("TsUser") TsUser tsUser,@Param("ids") List ids); + Integer getUserAndPositionCount(@Param("TsUser") TsUser tsUser); + + Integer userUnderInstitutionCount(@Param("TsUser") TsUser tsUser,@Param("ids") List ids); /** * 通过岗位Id列表查询用户ID列表 * @param positionIds：岗位ID列表 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java index 9e33e87e..667438d8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java @@ -83,4 +83,6 @@ public interface ITsUserService extends IService { List selectByName(String name); List selectNameById(List strings,String type); + + IPage getAllUsers(TsUser tsUser); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java index d3298b95..83752721 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java @@ -3,6 +3,8 @@ package com.adc.da.slrs.sarUser.service.impl; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.login.util.UserUtils; +import com.adc.da.slrs.sarInstitution.entity.TsInstitution; +import com.adc.da.slrs.sarInstitution.service.ITsInstitutionService; import com.adc.da.slrs.sarMenu.entity.SarMenu; import com.adc.da.slrs.sarMenu.service.ISarMenuService; import com.adc.da.slrs.sarPosition.dao.TsPositionDao; @@ -47,6 +49,8 @@ public class TsUserServiceImpl extends ServiceImpl implements @Autowired private TsUserDao tsUserDao; @Autowired + private ITsUserService tsUserService; + @Autowired private ITsPositionService tsPositionService; @Autowired @Lazy @@ -59,6 +63,8 @@ public class TsUserServiceImpl extends ServiceImpl implements private SyncUserService syncUserService; @Autowired private TsPositionDao tsPositionDao; + @Autowired + private ITsInstitutionService tsInstitutionService; public void deleteUser(){ @@ -364,4 +370,40 @@ public class TsUserServiceImpl extends ServiceImpl implements }); return result; } + + @Override + public IPage getAllUsers(TsUser tsUser) { + List ids=new ArrayList<>(); + ids.add(tsUser.getInstitutionId()); + List middle=new ArrayList<>(); + middle.addAll(ids); + boolean flag=true; + while (flag){ + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.in("parent_id",middle); + List tsmiddle=tsInstitutionService.list(queryWrapper); + if (tsmiddle.size()>0){ + tsmiddle.forEach(tsInstitution -> { + middle.add(tsInstitution.getId()); + }); + middle.removeAll(ids); + ids.addAll(middle); + }else { + tsmiddle.forEach(tsInstitution -> { + middle.add(tsInstitution.getId()); + }); + middle.removeAll(ids); + ids.addAll(middle); + flag=false; + } + } + Page tsUserPage = new Page<>(); + tsUserPage.setCurrent(tsUser.getCurrent()); + tsUserPage.setSize(tsUser.getSize()); + tsUserPage.setRecords(tsUserDao.userUnderInstitution((tsUser.getCurrent()-1)*tsUser.getSize(),tsUser.getSize(),tsUser,ids)); + tsUserPage.setTotal(tsUserDao.userUnderInstitutionCount(tsUser,ids)); + return tsUserPage; + } + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/DateUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/DateUtil.java index 83e709f9..75cfcef4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/DateUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/DateUtil.java @@ -11,6 +11,93 @@ import java.util.*; */ public class DateUtil { + public static String addDay(String date, Integer dayInt) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Date today = null; + try { + today = sdf.parse(date); + } catch (ParseException e) { + } + String endDate = sdf.format(today);//当前日期 + Calendar theCa = Calendar.getInstance(); + theCa.setTime(today); + theCa.add(theCa.DATE, +dayInt);//最后一个数字30可改，30天的意思 + Date start = theCa.getTime(); + String startDate = sdf.format(start);//三十天之前日期 + + return startDate; + } + + public static Date nextMonthFirstDate() { + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.DAY_OF_MONTH, 1); + calendar.add(Calendar.MONTH, 1); + return calendar.getTime(); + } + + public static Date printToDate(String date) { + Date date1 = null; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + try { + date1 = sdf.parse(date); + }catch (Exception e){ + e.getMessage(); + } + return date1; + } + + public static String printDateAll(Date date) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + return sdf.format(date); + } + + public static String printDate(Date date) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + return sdf.format(date); + } + + public static String firstOneDay(String date) { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Date today = null; + String startDate = ""; + try { + today = sdf.parse(date); + String endDate = sdf.format(today);//当前日期 + Calendar theCa = Calendar.getInstance(); + theCa.setTime(today); + theCa.add(Calendar.MONTH, 0); + theCa.set(Calendar.DAY_OF_MONTH, 1); + Date start = theCa.getTime(); + startDate = sdf.format(start); + } catch (ParseException e) { + } + + + return startDate; + } + + public static String finOneDay(String date) { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Date today = null; + String startDate = ""; + try { + today = sdf.parse(date); + String endDate = sdf.format(today);//当前日期 + Calendar theCa = Calendar.getInstance(); + theCa.setTime(today); + theCa.set(Calendar.DAY_OF_MONTH, 1); + theCa.set(Calendar.DATE, theCa.getActualMaximum(Calendar.DATE)); + Date start = theCa.getTime(); + startDate = sdf.format(start); + } catch (ParseException e) { + } + + + return startDate; + } + /** * 取起始时间到结束时间 所有的时间 * @param startTime @@ -115,6 +202,12 @@ public class DateUtil { public static void main(String[] args) { + System.out.println(printDate(new Date())); + System.out.println(firstOneDay(printDate(new Date()))); + System.out.println(finOneDay(printDate(new Date()))); + System.out.println(addDay(finOneDay(printDate(new Date())),2)); + System.out.println(printDate(nextMonthFirstDate())); + System.out.println(finOneDay(printDate(nextMonthFirstDate()))); String utcTime = "2021-04-15T01:43:54.296Z"; String time = formatStrUTCToDateStr("2021-04-15T01:43:54.296Z"); System.out.println("utcTime 转换前：" + utcTime); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index 34d1a0e1..09d36ed4 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -757,6 +757,20 @@ order by ITEMS_NUM + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml index 0425a16a..caba536b 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml @@ -82,5 +82,21 @@ from SAR_STAND_MENU where stand_id = #{standId} and valid_flag=0 + + 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 7abb5fd4..e36e2552 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 @@ -22,6 +22,7 @@ + @@ -366,6 +367,27 @@ + + @@ -672,7 +694,7 @@ select * from (select tmp_tb.* from (select - dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow, + dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow,SAR_BUSS_STAND_ATTR_INFO.DTQBBHBUSS, from SAR_BUSSIONESS_STAND diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml new file mode 100644 index 00000000..1acd176c --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml @@ -0,0 +1,105 @@ + + + + + + + + + ID, + STAND_ID, + STAND_NAME, + STAND_CODE, + REVIEW_TIME, + ISSUE_TIME, + REVIEW_RESULTS, + REVIEW_PROCESS_NUM, + CREATION_TIME, + MODIFY_TIME, + VALID_FLAG, + PARAM1, + PARAM2 + + + + where REVIEW_RESULTS IS NULL + AND DATE_FORMAT(REVIEW_TIME, '%Y-%m-%d') between DATE_FORMAT(current_timestamp(), '%Y-%m-%d') AND DATE_ADD(CURDATE(), INTERVAL 30 DAY) + + + and STAND_CODE like concat(concat('%',#{standCode}),'%') + + + and DATE_FORMAT(REVIEW_TIME, '%Y-%m-%d') between DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d') + + + and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%d') >= DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d') + + + and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%d') <= DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d') + + + and DATE_FORMAT(REVIEW_TIME, '%Y-%m-%d') between DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d') + + + and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%d') >= DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') + + + and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%d') <= DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d') + + + + + where REVIEW_RESULTS IS NOT NULL + + + and STAND_CODE like concat(concat('%',#{standCode}),'%') + + + and DATE_FORMAT(REVIEW_TIME, '%Y-%m-%d') between DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d') + + + and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%d') >= DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d') + + + and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%d') <= DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d') + + + and DATE_FORMAT(REVIEW_TIME, '%Y-%m-%d') between DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d') + + + and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%d') >= DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') + + + and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%d') <= DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d') + + + + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index 7350546f..b3c44c53 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -381,6 +381,24 @@ and sar_stand_project_library.category_name=#{sarStandProjectLibrary.categoryName} + limit ${(current-1) * size},${size} + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml index 47413212..0a403363 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml @@ -48,6 +48,49 @@ limit #{start},#{end} + + + +