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

Merge branch 'develop_master' into develop_migration

Browse Source
This commit is contained in:
396572590@qq.com
2022-06-30 09:31:51 +08:00
parent 4d0a56be74 67b877e5d5
commit 19b4863d18
37 changed files with 622 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
+7 -8
View File
@@ -6,7 +6,6 @@ import com.adc.da.scheduled.dao.SarStandardItemDao;
import com.adc.da.scheduled.dao.SarStandardWarningDao;
import com.adc.da.scheduled.entity.TermDTO;
import com.adc.da.slrs.ActivityDatas.entity.DataList;
import com.adc.da.slrs.processModel.utils.TrainFormDate;
import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao;
import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo;
@@ -22,8 +21,6 @@ import com.adc.da.sys.service.IDicTypeEOService;
import com.adc.da.util.UUIDUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
import net.sf.json.JSONObject;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -35,17 +32,12 @@ import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.PostConstruct;
import java.lang.reflect.InvocationTargetException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@EnableScheduling
@@ -133,6 +125,13 @@ public class ScheduledJob {
logger.info("========================================================================================================");
//删除不在预警范围的标准
int remove = sarStandardWarningDao.autoCancelWarning();
log.info("开始修整"+new Date()+"!");
try {
Thread.sleep(20000);
} catch (InterruptedException e) {
e.printStackTrace();
}
log.info("结束修整"+new Date()+"!");
logger.info("取消" + remove + "条预警");
//预警期限(当前日期至3个月后)
adc-da-slrs/src/main/java/com/adc/da/scheduled/WarningSchedulingTasks.java
+29
View File
@@ -0,0 +1,29 @@
package com.adc.da.scheduled;
import com.adc.da.common.GetBeanUtil;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Slf4j
public class WarningSchedulingTasks implements Runnable{
Logger logger = LoggerFactory.getLogger(WarningSchedulingTasks.class);
private ScheduledJob scheduledJob;
public WarningSchedulingTasks() {
scheduledJob= GetBeanUtil.getApplicationContext().getBean(ScheduledJob.class);
}
@Override
public void run() {
try{
Thread.sleep(2000);
scheduledJob.warningSchedulingTasks();
}catch(Exception e){
logger.info(e.getMessage());
}
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java
+11 -2
View File
@@ -1,13 +1,11 @@
package com.adc.da.slrs.StandardQA.controller;
import com.adc.da.base.web.BaseController;
import com.adc.da.slrs.NewsFeed.entity.NewsFeed;
import com.adc.da.slrs.StandardQA.dao.AskQuestionsDao;
import com.adc.da.slrs.StandardQA.entity.AskQuestions;
import com.adc.da.slrs.StandardQA.entity.AskQuestionsPage;
import com.adc.da.slrs.StandardQA.entity.AskUser;
import com.adc.da.slrs.StandardQA.entity.Reply;
import com.adc.da.slrs.StandardQA.entity.Subscription;
import com.adc.da.slrs.StandardQA.service.Impl.AskQuestionsServiceImpl;
import com.adc.da.slrs.StandardQA.service.Impl.AskUserServiceImpl;
import com.adc.da.util.UUIDUtils;
@@ -113,6 +111,17 @@ public class AskQuestionsController extends BaseController<AskQuestions> {
return Result.success(askQuestionsList);
}
/**
* 根据标准编号,等查询条件 查询我的回答
* @param askQuestions
* @return
*/
@GetMapping("/getAskQuestionsNew")
public ResponseMessage getAskQuestionsNew(AskQuestions askQuestions){
List<AskQuestions> askQuestionsList = askQuestionsService.getAskQuestionsNew(askQuestions);
return Result.success(askQuestionsList);
}
/**
* 根据问题ID查询回答***
* @param id
adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/dao/AskQuestionsDao.java
+3 -1
View File
@@ -18,6 +18,8 @@ public interface AskQuestionsDao extends BaseMapper<AskQuestions> {
List<AskQuestions> getAskQuestions (@Param("askQuestions") AskQuestions askQuestions);
List<AskQuestions> getAskQuestionsNew (@Param("ask") AskQuestions askQuestions);
List<AskQuestions> getReplyDetails (@Param("askQuestions") AskQuestions askQuestions);
List<AskQuestions> getReplyDetailsByStandId (@Param("askQuestions") AskQuestions askQuestions);
@@ -34,7 +36,7 @@ public interface AskQuestionsDao extends BaseMapper<AskQuestions> {
List<AskQuestions> getArchiveAskQuestions (String id);
List<Reply> getAskQuestionsByakId (String id,String state);
List<Reply> getAskQuestionsByakId (@Param("id") String id,@Param("state") String state);
List<String> getUId();
}
adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/AskQuestionsService.java
+1
View File
@@ -15,6 +15,7 @@ import java.util.List;
public interface AskQuestionsService extends IService<AskQuestions> {
List<AskQuestions> getAskQuestions(AskQuestions askQuestions);
List<AskQuestions> getAskQuestionsNew(AskQuestions askQuestions);
List<AskQuestions> getReplyDetails(AskQuestions askQuestions);
List<AskQuestions> getReplyDetailsByStandId(AskQuestions askQuestions);
adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/Impl/AskQuestionsServiceImpl.java → adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java
+9
View File
@@ -6,6 +6,7 @@ import com.adc.da.slrs.StandardQA.entity.AskQuestions;
import com.adc.da.slrs.StandardQA.entity.Reply;
import com.adc.da.slrs.StandardQA.service.AskQuestionsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -47,6 +48,9 @@ public class AskQuestionsServiceImpl extends ServiceImpl<AskQuestionsDao, AskQue
@Override
public List<AskQuestions> retrieve(AskQuestions askQuestions) {
if (StringUtils.isNotBlank(askQuestions.getStandardEncdoing())) {
askQuestions.setStandardEncdoing(askQuestions.getStandardEncdoing().replace(" ", " "));
}
return askQuestionsDao.retrieve(askQuestions);
}
@@ -65,6 +69,11 @@ public class AskQuestionsServiceImpl extends ServiceImpl<AskQuestionsDao, AskQue
return askQuestionsDao.getAskQuestionsByStandardId(standardId);
}
@Override
public List<AskQuestions> getAskQuestionsNew(AskQuestions askQuestions) {
return askQuestionsDao.getAskQuestionsNew(askQuestions);
}
@Override
public List<AskQuestions> getArchiveAskQuestions(String id) {
return askQuestionsDao.getArchiveAskQuestions(id);
adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/Impl/ReplyServiceImpl.java → adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/ReplyServiceImpl.java
View File
adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/entity/FileResult.java
+6 -2
View File
@@ -14,13 +14,17 @@ import java.io.Serializable;
@Data
public class FileResult {
@ApiModelProperty(value = "当前标准跳转到本系统内的链接地址")
@ApiModelProperty(value = "标准分类+空格+标准号+空格+标准名称")
@JSONField(ordinal=1)
private String documentName;
@ApiModelProperty(value = "标准分类+空格+标准号+空格+标准名称")
@ApiModelProperty(value = "当前标准跳转到本系统内的链接地址")
@JSONField(ordinal=2)
private String documentUrl;
@ApiModelProperty(value = "文本类型")
@JSONField(ordinal=2)
private String documentType= "标准法规系统";
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java
+2
View File
@@ -42,4 +42,6 @@ public class AddDetailedDto {
private String inforlist2;
@ApiModelProperty(value = "新车型实施时间")
private String inforlist3;
@ApiModelProperty(value = "适用认证")
private String inforlist4;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
+72 -49
View File
@@ -323,30 +323,50 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
sarLawsDetailedListDao.insert(sarLawsDetailedList);
if (addDetailedDto.getInforlist() != null) {
if (addDetailedDto.getInforlist().contains(",")) {
String[] id = addDetailedDto.getInforlist().split(",");
String[] putTime = addDetailedDto.getInforlist1().split(";");
String[] zcc = addDetailedDto.getInforlist2().split(";");
String[] xcx = addDetailedDto.getInforlist3().split(";");
String[] id = new String[]{};
String[] putTime = new String[]{};
String[] zcc = new String[]{};
String[] xcx = new String[]{};
String[] syrz = new String[]{};
if (StringUtils.isNotEmpty(addDetailedDto.getInforlist())) {
id = addDetailedDto.getInforlist().split(",");
}
if (StringUtils.isNotEmpty(addDetailedDto.getInforlist1())) {
putTime = addDetailedDto.getInforlist1().split(";");
}
if (StringUtils.isNotEmpty(addDetailedDto.getInforlist2())) {
zcc = addDetailedDto.getInforlist2().split(";");
}
if (StringUtils.isNotEmpty(addDetailedDto.getInforlist3())) {
xcx = addDetailedDto.getInforlist3().split(";");
}
if (StringUtils.isNotEmpty(addDetailedDto.getInforlist4())) {
syrz = addDetailedDto.getInforlist4().split(";");
}
for (int a = 0; a < id.length; a++) {
TimeDto dto = new TimeDto();
dto.setStandId(id[a]);
//putTiem即ssrq可能为空 ''
if (putTime.length > 0) {
if ("-".equals(putTime[a]) || null == putTime[a]) {
dto.setSsrq(null);
} else {
dto.setSsrq(putTime[a]);
}
if ("-".equals(putTime[a]) || null == xcx[a]) {
dto.setXcxssrqgj(null);
} else {
dto.setXcxssrqgj(xcx[a]);
}
if ("-".equals(putTime[a]) || null == zcc[a]) {
dto.setZccssrqgj(null);
} else {
dto.setZccssrqgj(zcc[a]);
}
if (putTime.length <= a) {
dto.setSsrq(null);
} else {
dto.setSsrq(putTime[a]);
}
if (xcx.length <= a) {
dto.setXcxssrqgj(null);
} else {
dto.setXcxssrqgj(xcx[a]);
}
if (zcc.length <= a) {
dto.setZccssrqgj(null);
} else {
dto.setZccssrqgj(zcc[a]);
}
if (syrz.length <= a) {
dto.setSyrz(null);
} else {
dto.setSyrz(syrz[a]);
}
timeDto.add(dto);
}
@@ -356,22 +376,25 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
dto.setSsrq(addDetailedDto.getInforlist1());
dto.setXcxssrqgj(addDetailedDto.getInforlist2());
dto.setZccssrqgj(addDetailedDto.getInforlist3());
dto.setSyrz(addDetailedDto.getInforlist4());
timeDto.add(dto);
}
} else {
timeDto = null;
}
service.insertDetailedList(sarLawsDetailedList.getId(), timeDto);
if (null != timeDto) {
List<SarStandardsInfo> sarStandardsInfos = new ArrayList<>();
timeDto.forEach(timeDto1 -> {
SarStandardsInfo sarStandardsInfo = new SarStandardsInfo();
sarStandardsInfo.setId(timeDto1.getStandId());
sarStandardsInfo.setIsRelateAccess("1");
sarStandardsInfos.add(sarStandardsInfo);
});
sarStandardsInfoService.updateBatchById(sarStandardsInfos);
List<String> list1 = new ArrayList<>();
List<String> list2 = new ArrayList<>();
//避免出现数据丢失 处理一下适用认证信息
list1.addAll(Arrays.asList(addDetailedDto.getInforlist().split(",")));
Hashtable<String, String> hashtable = new Hashtable<>();
for (TimeDto dto:timeDto) {
if (StringUtils.isNotBlank(dto.getSyrz())) {
hashtable.put(dto.getStandId(), dto.getSyrz());
}
}
//下面写消息队列了开始
createUpdateMQService.sendMQ(hashtable, list2, list1);
} catch (Exception e) {
e.printStackTrace();
@@ -656,16 +679,16 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
String[] zcc = new String[]{};
String[] xcx = new String[]{};
String[] syrz = new String[]{};
if(StringUtils.isNotEmpty(detailedUpDto.getInforlist())){
if (StringUtils.isNotEmpty(detailedUpDto.getInforlist())) {
id = detailedUpDto.getInforlist().split(",");
}
if(StringUtils.isNotEmpty(detailedUpDto.getInforlist1())){
if (StringUtils.isNotEmpty(detailedUpDto.getInforlist1())) {
putTime = detailedUpDto.getInforlist1().split(";");
}
if(StringUtils.isNotEmpty(detailedUpDto.getInforlist2())){
if (StringUtils.isNotEmpty(detailedUpDto.getInforlist2())) {
zcc = detailedUpDto.getInforlist2().split(";");
}
if(StringUtils.isNotEmpty(detailedUpDto.getInforlist3())){
if (StringUtils.isNotEmpty(detailedUpDto.getInforlist3())) {
xcx = detailedUpDto.getInforlist3().split(";");
}
if(StringUtils.isNotEmpty(detailedUpDto.getInforlist4())){
@@ -722,7 +745,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
if (list1.size() > 0) {
QueryWrapper<SarLawsAttrDetailedList> wrapper1 = new QueryWrapper<>();
wrapper1.in("stand_id", list1);
List<SarLawsAttrDetailedList> res = sarLawsAttrDetailedListDao.selectList(wrapper);
List<SarLawsAttrDetailedList> res = sarLawsAttrDetailedListDao.selectList(wrapper1);
if (res.size() > 0) {
res.forEach(sarLawsAttrDetailedList -> {
dealWithHashTableData(list1, list2, hashtable, sarLawsAttrDetailedList);
@@ -869,20 +892,20 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
}
//数据校验 先做重复交验+再做是否存在校验
if (null != res && "".equals(stringBuilder.toString())) {
for (ExportEmptyModelDto re:res) {
if(!(re.getSsrq().contains(",")||re.getSsrq().contains("，"))) {
for (ExportEmptyModelDto re : res) {
if (!(re.getSsrq().contains(",") || re.getSsrq().contains("，"))) {
Date date = org.apache.poi.ss.usermodel.DateUtil
.getJavaDate(Double.valueOf(re.getSsrq()));
DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
re.setSsrq(format.format(date));
}
if(!(re.getXcxssrqgj().contains(",")||re.getXcxssrqgj().contains("，"))) {
if (!(re.getXcxssrqgj().contains(",") || re.getXcxssrqgj().contains("，"))) {
Date date = org.apache.poi.ss.usermodel.DateUtil
.getJavaDate(Double.valueOf(re.getXcxssrqgj()));
DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
re.setXcxssrqgj(format.format(date));
}
if(!(re.getZccssrqgj().contains(",")||re.getZccssrqgj().contains("，"))) {
if (!(re.getZccssrqgj().contains(",") || re.getZccssrqgj().contains("，"))) {
Date date = org.apache.poi.ss.usermodel.DateUtil
.getJavaDate(Double.valueOf(re.getZccssrqgj()));
DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
@@ -989,10 +1012,10 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
ExportEmptyModelDto model = map.get(sarStandardsInfo.getId());
model.setStandName(sarStandardsInfo.getStandName());
model.setStandEnName(sarStandardsInfo.getStandEnName());
model.setNylx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("nylx") ?sarStandardsInfo.getAttrInfoCaseMap().get("nylx").toString():"");
model.setSycpx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("sycpx") ?sarStandardsInfo.getAttrInfoCaseMap().get("sycpx").toString():"");
model.setZrbm(null!=sarStandardsInfo.getAttrInfoCaseMap().get("zrbm") ?sarStandardsInfo.getAttrInfoCaseMap().get("zrbm").toString():"");
model.setSycx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("cllx") ?sarStandardsInfo.getAttrInfoCaseMap().get("cllx").toString():"");
model.setNylx(null != sarStandardsInfo.getAttrInfoCaseMap().get("nylx") ? sarStandardsInfo.getAttrInfoCaseMap().get("nylx").toString() : "");
model.setSycpx(null != sarStandardsInfo.getAttrInfoCaseMap().get("sycpx") ? sarStandardsInfo.getAttrInfoCaseMap().get("sycpx").toString() : "");
model.setZrbm(null != sarStandardsInfo.getAttrInfoCaseMap().get("zrbm") ? sarStandardsInfo.getAttrInfoCaseMap().get("zrbm").toString() : "");
model.setSycx(null != sarStandardsInfo.getAttrInfoCaseMap().get("cllx") ? sarStandardsInfo.getAttrInfoCaseMap().get("cllx").toString() : "");
result.add(model);
});
}
@@ -1016,10 +1039,10 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
ExportEmptyModelDto model = map.get(sarStandardsInfo.getId());
model.setStandName(sarStandardsInfo.getStandName());
model.setStandEnName(sarStandardsInfo.getStandEnName());
model.setNylx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("nylx") ?sarStandardsInfo.getAttrInfoCaseMap().get("nylx").toString():"");
model.setSycpx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("sycpx") ?sarStandardsInfo.getAttrInfoCaseMap().get("sycpx").toString():"");
model.setZrbm(null!=sarStandardsInfo.getAttrInfoCaseMap().get("zrbm") ?sarStandardsInfo.getAttrInfoCaseMap().get("zrbm").toString():"");
model.setSycx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("cllx") ?sarStandardsInfo.getAttrInfoCaseMap().get("cllx").toString():"");
model.setNylx(null != sarStandardsInfo.getAttrInfoCaseMap().get("nylx") ? sarStandardsInfo.getAttrInfoCaseMap().get("nylx").toString() : "");
model.setSycpx(null != sarStandardsInfo.getAttrInfoCaseMap().get("sycpx") ? sarStandardsInfo.getAttrInfoCaseMap().get("sycpx").toString() : "");
model.setZrbm(null != sarStandardsInfo.getAttrInfoCaseMap().get("zrbm") ? sarStandardsInfo.getAttrInfoCaseMap().get("zrbm").toString() : "");
model.setSycx(null != sarStandardsInfo.getAttrInfoCaseMap().get("cllx") ? sarStandardsInfo.getAttrInfoCaseMap().get("cllx").toString() : "");
result.add(model);
});
}
@@ -1042,11 +1065,11 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
ExportEmptyModelDto model = map.get(sarStandardsInfo.getId());
model.setStandName(sarStandardsInfo.getLawsName());
model.setStandEnName(sarStandardsInfo.getLawsEnName());
model.setNylx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("nylxlaws") ?sarStandardsInfo.getAttrInfoCaseMap().get("nylxlaws").toString():"");
model.setNylx(null != sarStandardsInfo.getAttrInfoCaseMap().get("nylxlaws") ? sarStandardsInfo.getAttrInfoCaseMap().get("nylxlaws").toString() : "");
//没有使用产品线
// model.setSycpx(null!=sarStandardsInfo.getLawsSycx() ?sarStandardsInfo.getLawsSycx():"");
model.setZrbm(null!=sarStandardsInfo.getAttrInfoCaseMap().get("zrbmlaws") ?sarStandardsInfo.getAttrInfoCaseMap().get("zrbmlaws").toString():"");
model.setSycx(null!=sarStandardsInfo.getLawsSycx() ?sarStandardsInfo.getLawsSycx():"");
model.setZrbm(null != sarStandardsInfo.getAttrInfoCaseMap().get("zrbmlaws") ? sarStandardsInfo.getAttrInfoCaseMap().get("zrbmlaws").toString() : "");
model.setSycx(null != sarStandardsInfo.getLawsSycx() ? sarStandardsInfo.getLawsSycx() : "");
result.add(model);
});
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java
+4
View File
@@ -95,4 +95,8 @@ public class StandWarningEO extends EarlyWarningEO {
@ApiModelProperty("范围查询发布日期结束")
@DateTimeFormat(pattern = "YYYY-MM-dd")
private String endIssueTime;
@ExcelIgnore
@ApiModelProperty("stand标准 item条款")
private String mark;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java
+28
View File
@@ -98,4 +98,32 @@ public class SarInterpretationNationalStandard extends BaseEntity {
@TableField("risk_degree")
private String riskDegree;
@TableField(exist = false)
private String applyArctic;
@TableField(exist = false)
private String compliianceRequir;
@TableField(exist = false)
private String responseibleUnit;
@TableField(exist = false)
private String termsConditions;
@TableField(exist = false)
private String mainpointsImpementation;
@TableField(exist = false)
private String svpps;
@TableField(exist = false)
private String fileType;
@TableField(exist = false)
private String xccssrq;
@TableField(exist = false)
private String zccssrq;
@TableField(exist = false)
private String complianceStateSSI;
@TableField(exist = false)
private String compareWithPrevious;
@TableField(exist = false)
private String coreTechnicalRequirementSSI;
@TableField(exist = false)
private String readContent;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/controller/WgCommitteeController.java
+4
View File
@@ -15,8 +15,11 @@ import com.adc.da.slrs.wgCommittee.entity.WgCommittee;
import io.swagger.annotations.Api;
import com.adc.da.base.web.BaseController;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -43,6 +46,7 @@ public class WgCommitteeController extends BaseController<WgCommittee> {
@PostMapping("/insert")
public ResponseMessage addWorkCommitter(WgCommittee wgCommittee) {
wgCommittee.setCreateTime(new Date());
if (isDistinct(wgCommittee.getCommitteeName(),null)){
if (iWgCommitteeService.add(wgCommittee)){
return Result.success("200","新增成功");
adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/entity/WgCommittee.java
+7
View File
@@ -9,6 +9,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
import java.util.List;
/**
@@ -36,12 +37,18 @@ public class WgCommittee extends BasePage {
@ApiModelProperty(value = "委员会主任")
private String committeeDirector;
@ApiModelProperty(value = "委员会副主任")
private String committeeDeputy;
@ApiModelProperty(value = "委员会秘书长")
private String committeeSecretary;
@ApiModelProperty(value = "委员关联表")
private String committeer;
@ApiModelProperty(value = "创建时间")
private Date createTime;
@ApiModelProperty(value = "委员")
@TableField(exist = false)
private String committeeIds;
adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/entity/WgCommitteeDTO.java
+6
View File
@@ -24,6 +24,12 @@ public class WgCommitteeDTO {
@ApiModelProperty(value = "委员会主任")
private String committeeDirector;
@ApiModelProperty(value = "委员会主任")
private String committeeDeputy;
@ApiModelProperty(value = "委员会主任名称")
private String committeeDeputyName;
@ApiModelProperty(value = "委员会主任")
private String committeeDirectorName;