FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_master' into FOTON

Browse Source
This commit is contained in:
Superman_Main
2021-11-21 20:34:31 +08:00
parent ed128e1403 ad4b9c0998
commit 0a39e89c8e
10 changed files with 232 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/PolicyWorkFlowController.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class PolicyWorkFlowController {
private PolicyWorkFlowService policyWorkFlowService;
/**
* 政策征求意见导出
* 纳入重点问题管控
*/
@PostMapping("/enterIssue")
@ApiOperation("纳入重点问题管控")
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/PolicyWorkFlowService.java
+10 -4
View File
@@ -21,9 +21,11 @@ public class PolicyWorkFlowService {
public boolean enterIssue(String json){
boolean count=false; //是否成功
JSONObject dataJsonObj = JSONObject.parseObject(json);
JSONObject jsonData = dataJsonObj.getJSONObject("json");
if ("1".equals(dataJsonObj.getString("department"))) {
JSONArray dataList = dataJsonObj.getJSONArray("dataList");
if ("1".equals( jsonData.getString("feedbackDept"))) {
JSONArray dataList = jsonData.getJSONArray("infoTableDatas");
/**
* 把json对象转换未实体对象
@@ -31,11 +33,15 @@ public class PolicyWorkFlowService {
List<BusinessDeptIssue> data = dataList
.stream()
.map(jsonObj -> {
BusinessDeptIssue businessDeptIssue = JSONObject.parseObject(jsonObj.toString(), BusinessDeptIssue.class);
businessDeptIssue.setLawId(businessDeptIssue.getId());
businessDeptIssue.setId(UUIDUtils.randomUUID20());
businessDeptIssue.setIsClose("0");
return businessDeptIssue;
}).collect(Collectors.toList());
}).collect(Collectors.toList())
.stream()
.filter(item->"1".equals(item.getIsRisk()))
.collect(Collectors.toList());
count=businessDeptIssueService.saveBatch(data);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java
+13 -2
View File
@@ -28,7 +28,12 @@ public class IssueTrackController {
@ApiOperation("新增重点标准跟踪清单项目")
public ResponseMessage addIssueTrack(@RequestBody IssueTrack issueTrack){
boolean b = issueTrackService.addIssueTrack(issueTrack);
return Result.success(b);
if (b){
return Result.success("200","成功", true);
}else{
return Result.error("100","数据不能相同", false);
}
}
@@ -52,6 +57,12 @@ public class IssueTrackController {
@ApiOperation("更新重点标准跟踪清单项目")
public ResponseMessage updateIssueTrack(@RequestBody IssueTrack issueTrack){
boolean b = issueTrackService.updateIssueTrack(issueTrack);
return Result.success(b);
// return Result.success("200","数据不能相同",false);
if (b){
return Result.success("200","成功", true);
}else{
return Result.error("100","数据不能相同", false);
}
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/dao/IssueTrackDao.java
+10
View File
@@ -1,7 +1,17 @@
package com.adc.da.slrs.sarIssueTrack.dao;
import com.adc.da.slrs.sarIssueTrack.entity.IssueTrack;
import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssue;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Param;
public interface IssueTrackDao extends BaseMapper<IssueTrack> {
public IPage<IssueTrack> findPage(IPage<IssueTrack> page, @Param(value = "pageVo") IssueTrack pageVo);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java
+12 -1
View File
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -20,7 +21,17 @@ public class IssueTrack {
@TableField("law_id")
private String lawId;
@TableField("law_name")
@ApiModelProperty("国内标准库 INLAND" +
"海外标准库 FOREIGN" +
"国内外政策库 FOREIGN_LAWS" +
"企业标准库 BUSINESS_STAND")
@TableField("data_source")
private String dataSource;
@TableField(exist = false)
private String lawCode;
@TableField(exist = false)
private String lawName;
@TableField("product_type")
adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java
+26 -25
View File
@@ -25,9 +25,20 @@ public class IssueTrackServiceImpl extends ServiceImpl<IssueTrackDao, IssueTrack
@Override
public boolean addIssueTrack(IssueTrack obj) {
obj.setId(UUIDUtils.randomUUID20());
obj.setDelFlag("0");
return this.save(obj);
QueryWrapper<IssueTrack> wrapper = new QueryWrapper<>();
wrapper.eq("law_id",obj.getLawId())
.eq("del_flag","0");
IssueTrack one = this.getOne(wrapper);
if (one==null){
return false;
}else {
obj.setId(UUIDUtils.randomUUID20());
obj.setDelFlag("0");
return this.save(obj);
}
}
@Override
@@ -40,26 +51,7 @@ public class IssueTrackServiceImpl extends ServiceImpl<IssueTrackDao, IssueTrack
IPage<IssueTrack> trackPage = new Page<>(objVo.getPage(), objVo.getPageSize());
QueryWrapper<IssueTrack> wrapper = new QueryWrapper<>();
if (objVo.getPage()!=null && objVo.getPageSize()!=null){
trackPage=new Page<>(objVo.getPage(),objVo.getPageSize());
}else {
Integer count = issueTrackDao.selectCount(wrapper);
trackPage=new Page<>(0,count,false);
}
if (objVo.getLawId()!=null){
wrapper.like("law_id",objVo.getLawId());
}
if (objVo.getLawName()!=null){
wrapper.like("law_name",objVo.getLawName());
}
if (objVo.getProductType()!=null){
wrapper.like("product_type",objVo.getProductType());
}
trackPage = issueTrackDao.selectPage(trackPage, wrapper);
trackPage = issueTrackDao.findPage(trackPage,objVo);
return trackPage;
@@ -67,7 +59,16 @@ public class IssueTrackServiceImpl extends ServiceImpl<IssueTrackDao, IssueTrack
@Override
public boolean updateIssueTrack(IssueTrack obj) {
return this.updateById(obj);
QueryWrapper<IssueTrack> wrapper = new QueryWrapper<>();
wrapper.eq("law_id",obj.getLawId());
IssueTrack one = this.getOne(wrapper);
if (one==null){
return false;
}else {
obj.setId(UUIDUtils.randomUUID20());
obj.setDelFlag("0");
return this.updateById(obj);
}
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java
+4
View File
@@ -85,6 +85,10 @@ public class BusinessDeptIssue {
@TableField("is_close")
private String isClose;
@ExcelIgnore
@TableField("is_risk")
private String isRisk;
@ExcelIgnore
@TableField(exist = false)
private Integer page;
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java
+35 -13
View File
@@ -4,6 +4,8 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import com.adc.da.base.web.BaseController;
import com.adc.da.http.PageInfo;
import com.adc.da.person.entity.PersonMsgEO;
@@ -193,20 +195,40 @@ public class SarFileSplitInfoEOController extends BaseController<SarFileSplitInf
/**
* 使选定的拆分条款 插入分解单
*/
querySame.forEach(item->{
QueryWrapper<SarStandItems> sarStandItemsQueryWrapper = new QueryWrapper<>();
sarStandItemsQueryWrapper.eq("edit_flag",item.getEditFlag());
SarStandItems sarStandItems = new SarStandItems();
sarStandItems.setStandId(sarFileSplitInfoEO.getStandId());
sarStandItems.setEditFlag(item.getEditFlag());
sarStandItems.setItemsName(item.getItemsName());
sarStandItems.setTermsConditions(item.getItermsConditions());
sarStandItems.setItemsNum(item.getItemsNum());
sarStandItems.setId(UUIDUtils.randomUUID20());
sarStandItems.setFileType(sarFileSplitInfoEO.getFileType());
ServiceImpl.saveOrUpdate(sarStandItems,sarStandItemsQueryWrapper);
});
List<SarStandItems> sarStandItemList = querySame.stream()
.map(item -> {
SarStandItems sarStandItem = new SarStandItems();
sarStandItem.setStandId(sarFileSplitInfoEO.getStandId());
sarStandItem.setEditFlag(item.getEditFlag());
sarStandItem.setItemsName(item.getItemsName());
sarStandItem.setTermsConditions(item.getItermsConditions());
sarStandItem.setItemsNum(item.getItemsNum());
sarStandItem.setId(UUIDUtils.randomUUID20());
sarStandItem.setFileType(sarFileSplitInfoEO.getFileType());
sarStandItem.setEditFlag(item.getEditFlag());
return sarStandItem;
})
.collect(Collectors.toList());
ServiceImpl.saveBatch(sarStandItemList);
// querySame.forEach(item->{
// QueryWrapper<SarStandItems> sarStandItemsQueryWrapper = new QueryWrapper<>();
// sarStandItemsQueryWrapper.eq("edit_flag",item.getEditFlag());
// SarStandItems sarStandItems = new SarStandItems();
// sarStandItems.setStandId(sarFileSplitInfoEO.getStandId());
// sarStandItems.setEditFlag(item.getEditFlag());
// sarStandItems.setItemsName(item.getItemsName());
// sarStandItems.setTermsConditions(item.getItermsConditions());
// sarStandItems.setItemsNum(item.getItemsNum());
// sarStandItems.setId(UUIDUtils.randomUUID20());
// sarStandItems.setFileType(sarFileSplitInfoEO.getFileType());
// ServiceImpl.saveOrUpdate(sarStandItems,sarStandItemsQueryWrapper);
//
// });
//根据标准号查询标准是否存在
adc-da-slrs/src/main/resources/mybatis/mapper/IssueTrackMapper/IssueTrackMapper.xml
+120
View File
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.adc.da.slrs.sarIssueTrack.dao.IssueTrackDao">
<resultMap id="IssueTrackPage" type="com.adc.da.slrs.sarIssueTrack.entity.IssueTrack">
<result property="id" column="ID"/>
<result property="lawId" column="law_id"/>
<result property="dataSource" column="data_source"/>
<result property="lawCode" column="law_code"/>
<result property="lawName" column="law_name"/>
<result property="productType" column="product_type"/>
<result property="implTime" column="impl_time"/>
<result property="implRequire" column="impl_require"/>
</resultMap>
<sql id="issueColumn">
issue.id,data_source,law_id,product_type,impl_time,impl_require
</sql>
<select id="findPage" resultMap="IssueTrackPage" parameterType="com.adc.da.slrs.sarIssueTrack.entity.IssueTrackVo">
(
SELECT
CONCAT(
sarInfo.STAND_SORT,
' ',
sarInfo.STAND_NUMBER,
'-',
sarInfo.STAND_YEAR
) AS law_code,
sarInfo.STAND_NAME AS law_name,
<include refid="issueColumn"/>
FROM
issue_track AS issue
JOIN sar_standards_info AS sarInfo ON sarInfo.ID = issue.law_id
<where>
del_flag=0
<if test="pageVo.lawCode != null and pageVo.lawCode != ''">
trim(replace(CONCAT(
sarInfo.STAND_SORT,
' ',
sarInfo.STAND_NUMBER,
'-',
sarInfo.STAND_YEAR
),' ','')) LIKE trim(replace(CONCAT('%',#{pageVo.lawCode},'%'),' ',''))
</if>
<if test="pageVo.lawName != null and pageVo.lawName != ''">
sarInfo.STAND_NAME LIKE CONCAT('%',#{pageVo.lawName},'%')
</if>
<if test="pageVo.productType != null and pageVo.productType != ''">
issue.product_type LIKE CONCAT('%',#{pageVo.productType},'%')
</if>
</where>
) UNION ALL (
SELECT
sarInfo.LAWS_NUMBER AS law_code,
sarInfo.LAWS_NAME AS law_name,
<include refid="issueColumn"/>
FROM
issue_track AS issue
JOIN sar_laws_stand_info AS sarInfo ON sarInfo.ID = issue.law_id
<where>
del_flag=0
<if test="pageVo.lawCode != null and pageVo.lawCode != ''">
sarInfo.LAWS_NUMBER LIKE CONCAT('%',#{pageVo.lawCode},'%')
</if>
<if test="pageVo.lawName != null and pageVo.lawName != ''">
sarInfo.LAWS_NAME LIKE CONCAT('%',#{pageVo.lawName},'%')
</if>
<if test="pageVo.productType != null and pageVo.productType != ''">
issue.product_type LIKE CONCAT('%',#{pageVo.productType},'%')
</if>
</where>
) UNION ALL (
SELECT
sarInfo.STAND_CODE AS law_code,
sarInfo.STAND_NAME AS law_name,
<include refid="issueColumn"/>
FROM
issue_track AS issue
JOIN sar_bussioness_stand AS sarInfo ON sarInfo.ID = issue.law_id
<where>
del_flag=0
<if test="pageVo.lawCode != null and pageVo.lawCode != ''">
sarInfo.STAND_CODE LIKE CONCAT('%',#{pageVo.lawCode},'%')
</if>
<if test="pageVo.lawName != null and pageVo.lawName != ''">
sarInfo.STAND_NAME LIKE CONCAT('%',#{pageVo.lawName},'%')
</if>
<if test="pageVo.productType != null and pageVo.productType != ''">
issue.product_type LIKE CONCAT('%',#{pageVo.productType},'%')
</if>
</where>
)
</select>
</mapper>
adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml
+1 -1
View File
@@ -407,7 +407,7 @@
from TS_DICTIONARY dn LEFT JOIN TS_DICTYPE dt ON dn.ID = dt.DIC_ID
where dictionary_code = #{dictionaryCode} AND dn.VALID_FLAG = 0 AND dt.VALID_FLAG = 0
AND dt.parent_id is NULL
order by show_index asc
order by show_index asc ,dt.dic_type_name asc
</select>
<select id="getFineDicTypeByDicCode" parameterType="java.lang.String" resultMap="BaseResultMap">