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

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!60
This commit is contained in:
高嵩
2023-04-23 18:24:20 +08:00
parent d80471e851 3208037117
commit 42c6c8a030
17 changed files with 258 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
+3
View File
@@ -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<BusProcessNew> updateBusProcessNew(@RequestParam("id") String id, @RequestParam("mags") String mags);
@RequestMapping(value = "/bat-wkflow/datas/bus-process-new/getSarBussionStandPageNo",method = RequestMethod.POST)
List<SarBussionessStandState> getSarBussionStandPageNo(@RequestBody List<SarBussionessStandState> rows);
}
adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java
+5
View File
@@ -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<SarBussionessStandState> getSarBussionStandPageNo(@RequestBody List<SarBussionessStandState> rows) {
return workFlowFeignClient.getSarBussionStandPageNo(rows);
}
}
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java
+34 -1
View File
@@ -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<ActSarItemsEO> {
@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不能为空");
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+28 -6
View File
@@ -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<BusProcessNew> updateBusProcessNew(BusMes busMes) {
return workFlowFeignClient.updateBusProcessNew(busMes);
}
/**
* 自定义分页复审流程查询列表
* @param page 标准信息
* @return
*/
@ApiOperation(value = "|SarBussionessStandState|自定义分页复审流程查询列表")
@GetMapping("/getSarBussionStandPageNo")
//@RequiresPermissions("lawss:sarBussionessStand:getSarBussionStandPage")
public ResponseMessage<PageInfo<T>> getSarBussionStandPageNo(SarBussionessStandStatePage page) throws Exception {
List<SarBussionessStandState> rows = bussionessStandStateService.getSarBussionessStandStatePageNo(page);
if(!rows.isEmpty()) {
List<SarBussionessStandState> rowsList = workFlowFeignClient.getSarBussionStandPageNo(rows);
return Result.success(getPageInfo(page.getPager(), rowsList));
}
return Result.success(getPageInfo(page.getPager(), rows));
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java
+8 -5
View File
@@ -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<String,Object> getBussStandTypeData(){
private Map<String,Object> getBussStandTypeData(){
Map<String,Object> resultMap = new HashMap<>();
List<Map<String,String>> bussStandTypeList = new ArrayList<>();
char letter = 'A';
for(letter = 'A'; letter <= 'Z'; ++letter){
List<String> dicTypeNameList = new ArrayList<>();
String dicId = "NGETEMDJDI";
dicTypeNameList = dicTypeEOService.selectByDicId(dicId);
for (String dicTypeName : dicTypeNameList){
Map<String,String> 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);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfo.java
+6 -1
View File
@@ -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;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+45
View File
@@ -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<SarBussionessSt
}
sarBussionessStandEO.setModifyTime(new Date());
sarBussionessStandEOService.updateSarBussionessStand(sarBussionessStandEO);
QueryWrapper<SarBussStandAttrInfo> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("STAND_ID",sarBussionessStandEO.getId());
List<SarBussStandAttrInfo> 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);
}
@@ -619,5 +658,11 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
public ResponseMessage selectByIdAtt (String id){
return sarBussionessStandEOService.selectByIdAtt(id);
}
@ApiOperation(value = "企业标准 复审日期数据清洗")
@GetMapping("/cleaningDataReview")
public ResponseMessage cleaningDataReview (){
return sarBussionessStandEOService.cleaningDataReview();
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java
+1
View File
@@ -130,5 +130,6 @@ public interface SarBussionessStandDao extends BaseMapper<SarBussionessStand> {
@Select("select * from sar")
String setDtqbbhbuss(String dtqbbhbuss);
String selectByStandCode(String standCode);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java
+2
View File
@@ -66,5 +66,7 @@ public interface ISarBussionessStandService extends IService<SarBussionessStand>
ResponseMessage selectById(String id,String type);
ResponseMessage selectByIdAtt(String id);
ResponseMessage cleaningDataReview();
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+102 -1
View File
@@ -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;
@@ -2833,13 +2834,14 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
sarBussionessStand.setStandCode(standCode);
// 根据标准号判断数据是否已存在
//2021年4月9日 此处检查当前是否存在standId
String id = sarBussionessStandEODao.selectByStandCode(sarBussionessStand.getStandCode());
QueryWrapper<SarBussionessStand>queryWrapper = new QueryWrapper<>();
queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode())
.eq(standName != null,"STAND_NAME",standName);
List<SarBussionessStand> 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() +"已存在");
@@ -4472,6 +4474,66 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
return Result.success(sarBussStandAttrInfoList);
}
@Override
public ResponseMessage cleaningDataReview() {
//取出所有数据
QueryWrapper<SarBussionessStand> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.isNotNull("ISSUE_TIME");
objectQueryWrapper.isNotNull("STAND_SORT");
List<SarBussionessStand> sarBussionessStands = baseMapper.selectList(objectQueryWrapper);
if(sarBussionessStands.isEmpty()){
return Result.error("无合法数据更正，发布日期或者标准编号不可为null");
}
List<SarBussStandAttrInfo> 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<SarBussStandAttrInfo> 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<SarBussStandAttrInfo> 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<String> asList,String standId,String attfId) {
//重复的集合
List<AttFileEO> chongfu = new ArrayList<>();
@@ -4587,6 +4649,45 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
// writeWarnings(sarBussionessStandEO);
// 处理属性表信息
if (StringUtils.isNotBlank(sarBussionessStandEO.getSarStandAttrEOStr())) {
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()));
String sarStandAttrEOStr = sarBussionessStandEO.getSarStandAttrEOStr();
if(StringUtils.isNotBlank(sarStandAttrEOStr)){
Map<String,String> 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<String,String> sarStandAttrMap = JSONObject.fromObject(sarStandAttrEOStr);
sarStandAttrMap.put("FSRQBUSS",sdf.format(instance.getTime()));
sarBussionessStandEO.setSarStandAttrEOStr(sarStandAttrMap.toString());
}
} catch (ParseException e) {
e.printStackTrace();
}
}
}
createStandAttrInfo(sarBussionessStandEO,false);
}
// 增加关联事件
adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/impl/TsDicTypeServiceImpl.java
+1
View File
@@ -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;
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
+4
View File
@@ -1250,6 +1250,10 @@
and smenu.MENU_ID = '44'
</select>
<select id="selectByStandCode" resultType="java.lang.String">
select id from sar_bussioness_stand where stand_code = #{standCode} and VALID_FLAG = 0 limit 1
</select>
<update id="updateByIdInfo" >
update sar_buss_stand_attr_info ss set ss.FBGBUSS = #{strFile}
where id = #{attfId}
adc-da-slrs/src/main/resources/mysql/interfaceLog.sql
+7
View File
@@ -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待办任务 通用接口
-- 详情
adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java
+2
View File
@@ -92,4 +92,6 @@ public interface DicTypeEODao extends BaseMapper<DicTypeEO> {
List<DicTypeEO> selectPidByCode(@Param("fileType") String fileType);
List<DicTypeEO> selectDic(String id);
List<String> selectByDicId(@Param("dicId") String dicId);
}
adc-da-sys/src/main/java/com/adc/da/sys/service/IDicTypeEOService.java
+1
View File
@@ -88,4 +88,5 @@ public interface IDicTypeEOService extends IService<DicTypeEO> {
public List<Map<String,String>> getDicTypeByParentCodes(String dicTypeCode);
List<String> selectByDicId(String dicId);
}
adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicTypeEOServiceImpl.java
+5
View File
@@ -278,6 +278,11 @@ public class DicTypeEOServiceImpl extends ServiceImpl<DicTypeEODao,DicTypeEO> im
return listMap;
}
@Override
public List<String> selectByDicId(String dicId) {
return dicTypeEODao.selectByDicId(dicId);
}
/**
* @Author liwenxuan
* @Description 用来企业大类判断新增是否重复
adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml
+4
View File
@@ -649,4 +649,8 @@
WHERE
DIC_ID = #{id}
</select>
<select id="selectByDicId" resultType="java.lang.String">
select DIC_TYPE_NAME from ts_dictype where dic_id = #{dicId}
</select>
</mapper>