Merge branch 'develop_master' into develop_migration

2022-06-30 09:31:51 +08:00
parent 4d0a56be74 67b877e5d5
commit 19b4863d18
37 changed files with 622 additions and 185 deletions
@@ -133,6 +133,10 @@
            <version>19.0</version>
            <scope>compile</scope>
        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>

    </dependencies>
 </project>
@@ -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个月后)
@@ -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());
+        }
+    }
+}
@@ -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
@@ -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();
 }
@@ -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);
@@ -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);
@@ -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= "标准法规系统";
+

 }
@@ -42,4 +42,6 @@ public class AddDetailedDto {
    private String inforlist2;
    @ApiModelProperty(value = "新车型实施时间")
    private String inforlist3;
+    @ApiModelProperty(value = "适用认证")
+    private String inforlist4;
 }
@@ -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);
            });
        }
@@ -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;
 }
@@ -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;
+
 }
@@ -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","新增成功");
@@ -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;
@@ -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;

@@ -6,9 +6,10 @@
            SELECT
            DISTINCT
            aq.STANDARD_ID,aq.CLASSIFICATION,aq.STANDARD_ENCDOING,
-            aq.STANDARD_NAME
+            aq.STANDARD_NAME,
+            MAX(aq.QUESTION_TIME) as questionTime
            FROM ask_questions aq
-            LEFT JOIN reply ON aq.ID = reply.ASK_ID
+            LEFT JOIN (SELECT DISTINCT re.ANSWERER,re.ASK_ID FROM reply re) reply ON aq.ID = reply.ASK_ID
            LEFT JOIN ts_user t1 ON t1.USID = aq.QUESTIONER
            LEFT JOIN ts_user t2 ON t2.USID = reply.ANSWERER
            <where>
@@ -37,6 +38,13 @@
                    AND reply.ANSWERER = #{askQuestions.answerer}
                </if>
            </where>
+            GROUP BY
+            aq.STANDARD_ID,
+            aq.CLASSIFICATION,
+            aq.STANDARD_ENCDOING,
+            aq.STANDARD_NAME
+            ORDER BY
+            questionTime DESC
    </select>

    <select id="getAskQuestionsByStandardId" resultType="com.adc.da.slrs.StandardQA.entity.AskQuestions">
@@ -49,6 +57,7 @@
                    AND aq.STANDARD_ID = #{standardId}
                </if>
            </where>
+            order by QUESTION_TIME desc
    </select>

    <select id="getArchiveAskQuestions" resultType="com.adc.da.slrs.StandardQA.entity.AskQuestions">
@@ -82,9 +91,9 @@

    <select id="getReplyDetails" resultType="com.adc.da.slrs.StandardQA.entity.AskQuestions">
            SELECT
-            DISTINCT
            aq.STANDARD_ID,aq.CLASSIFICATION,aq.STANDARD_ENCDOING,
-            aq.STANDARD_NAME
+            aq.STANDARD_NAME,
+            MAX(aq.QUESTION_TIME) as questionTime
            FROM ask_questions aq
            LEFT JOIN reply ON aq.ID = reply.ASK_ID AND reply.STATE = '0'
            LEFT JOIN ts_user t1 ON t1.USID = aq.QUESTIONER
@@ -98,6 +107,13 @@
                    AND aq.CLASSIFICATION = #{askQuestions.classification}
                </if>
            </where>
+            GROUP BY
+            aq.STANDARD_ID,
+            aq.CLASSIFICATION,
+            aq.STANDARD_ENCDOING,
+            aq.STANDARD_NAME
+            ORDER BY
+            questionTime DESC
    </select>

    <select id="getReplyDetailsByStandId" resultType="com.adc.da.slrs.StandardQA.entity.AskQuestions">
@@ -118,8 +134,8 @@

    <select id="getAskQuestionsBySubscription" resultType="com.adc.da.slrs.StandardQA.entity.AskQuestions">
        SELECT
-        DISTINCT
-        aq.STANDARD_ID,aq.CLASSIFICATION,aq.STANDARD_ENCDOING,aq.STANDARD_NAME
+        aq.STANDARD_ID,aq.CLASSIFICATION,aq.STANDARD_ENCDOING,aq.STANDARD_NAME,
+        MAX(aq.QUESTION_TIME) as questionTime
        FROM ask_questions aq
        LEFT JOIN reply ON aq.ID = reply.ASK_ID
        LEFT JOIN ts_user t1 ON t1.USID = aq.QUESTIONER
@@ -133,6 +149,13 @@
                AND aq.CLASSIFICATION = #{askQuestions.classification}
            </if>
        </where>
+        GROUP BY
+        aq.STANDARD_ID,
+        aq.CLASSIFICATION,
+        aq.STANDARD_ENCDOING,
+        aq.STANDARD_NAME
+        ORDER BY
+        questionTime DESC
    </select>

    <select id="retrieve" resultType="com.adc.da.slrs.StandardQA.entity.AskQuestions">
@@ -206,7 +229,7 @@
    </select>

    <select id="resemblance" resultType="com.adc.da.slrs.StandardQA.entity.AskQuestions">
-        SELECT *,
+        SELECT DISTINCT *,
        <foreach item="item" collection="chars" separator="+" open="(" close=")" index="">
            (case when PROBLEM_DESCRIPTION like CONCAT('%',#{item},'%') then 1 else 0 end)
        </foreach>
@@ -220,6 +243,24 @@
            WHERE
                ti.`name`='标准法规部'
    </select>
+    <select id="getAskQuestionsNew" resultType="com.adc.da.slrs.StandardQA.entity.AskQuestions">
+        SELECT aq.ID,aq.CLASSIFICATION,aq.PROBLEM_DESCRIPTION,t1.UNAME QUESTIONER,aq.QUESTION_TIME,aq.STANDARD_ENCDOING,
+        aq.STANDARD_NAME,aq.STANDARD_ID
+        FROM ask_questions aq
+        LEFT JOIN ts_user t1 ON t1.USID = aq.QUESTIONER
+        <where>
+            <if test="ask.standardId !=null and ask.standardId !=''">
+                AND aq.STANDARD_ID = #{ask.standardId}
+            </if>
+            <if test="ask.problemDescription !=null and ask.problemDescription !=''">
+                AND aq.PROBLEM_DESCRIPTION LIKE concat(concat('%',#{ask.problemDescription}),'%')
+            </if>
+            <if test="ask.classification !=null and ask.classification !=''">
+                AND aq.CLASSIFICATION LIKE concat(concat('%',#{ask.classification}),'%')
+            </if>
+        </where>
+        order by QUESTION_TIME desc
+    </select>


 </mapper>
@@ -31,10 +31,6 @@
            and (SAR_STAND_ATTR_INFO.KCCVPPSBM like concat(#{vppsCode},'%') or SAR_STAND_ATTR_INFO.CYCVPPSBM like
            concat(#{vppsCode},'%'))
        </if>
-        <if test="vppsName != null and vppsName != ''">
-            and (SAR_STAND_ATTR_INFO.KCCVPPSCN like concat('%',#{vppsName},'%') or SAR_STAND_ATTR_INFO.CYCVPPSCN like
-            concat('%',#{vppsName},'%'))
-        </if>
        UNION
        SELECT
        sar_bussioness_stand.id AS standId,
@@ -53,10 +49,6 @@
            and (sar_buss_stand_attr_info.KCVPPSBMBUSS like concat(#{vppsCode},'%') or
            sar_buss_stand_attr_info.CYCVPPSBMBUSS like concat(#{vppsCode},'%'))
        </if>
-        <if test="vppsName != null and vppsName != ''">
-            and (sar_buss_stand_attr_info.KCVPPSCNBUSS like concat('%',#{vppsName},'%') or
-            sar_buss_stand_attr_info.CYCVPPSCNBUSS like concat('%',#{vppsName},'%'))
-        </if>
        ) t
    </select>
    <select id="searchStandDataThree" resultMap="BaseResultMap">
@@ -3,7 +3,7 @@
 <mapper namespace="com.adc.da.slrs.sarStandIdea.dao.SarPublicIdeaAllDao">

    <select id="getPublicIdea" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
-        SELECT sar_public_idea_all.id,sar_public_idea_all.reason,ts_institution.name as dept_name,ts_institution.name as department,sar_public_idea_all.old_text,
+        SELECT sar_public_idea_all.id,sar_public_idea_all.reason,concat(t3.name,'_',t2.name,'_',ts_institution.name) as dept_name,ts_institution.name as department,sar_public_idea_all.old_text,
         sar_public_idea_all.new_text,ts_user.INSTITUTION_ID as dept_id,sar_public_idea_all.part_code,sar_public_idea_all.user_name,
         sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid,
         sar_public_idea_all.chapter_name as chapterName,sar_public_idea_all.wk_flag,sar_public_idea_all.cause, sar_public_idea_all.state,sar_public_idea_all.source_type as sourceType
@@ -11,6 +11,8 @@
        INNER JOIN sar_public_idea_all on sar_public_idea_all.idea_id = sar_public_idea.id
        left join ts_user on ts_user.USID = sar_public_idea_all.user_id
        left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
+        left join ts_institution t2 on ts_institution.parent_id=t2.id
+        left join ts_institution t3 on t2.parent_id=t3.id
        WHERE sar_public_idea_all.idea_id IS NOT NULL and sar_public_idea.uniques = #{unique}
    </select>

@@ -31,7 +33,7 @@
        FROM
        (
        SELECT (@i:=@i+1) as rows,
-        sar_public_idea_all.id,sar_public_idea_all.reason,ts_institution.name as dept_name,sar_public_idea_all.old_text,
+        sar_public_idea_all.id,sar_public_idea_all.reason,concat(t3.name,'_',t2.name,'_',ts_institution.name) as dept_name,sar_public_idea_all.old_text,
        sar_public_idea_all.wk_flag,sar_public_idea_all.new_text,ts_user.INSTITUTION_ID as dept_id,
        sar_public_idea_all.part_code,sar_public_idea_all.user_name,
        sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid,
@@ -39,6 +41,8 @@
        FROM (sar_public_idea_all,(SELECT @i:=0)j)
        left join ts_user on sar_public_idea_all.user_id=ts_user.USID
        left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
+        left join ts_institution t2 on ts_institution.parent_id=t2.id
+        left join ts_institution t3 on t2.parent_id=t3.id
        WHERE
        sar_public_idea_all.idea_id = #{ideaId}
        )c
@@ -53,11 +57,13 @@
    </select>

    <select id="getPublicAllIdea" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
-        SELECT sar_public_idea_all.id,reason,ts_institution.name as
+        SELECT sar_public_idea_all.id,reason,concat(t3.name,'_',t2.name,'_',ts_institution.name) as
        deptName,old_text,new_text,dept_id,part_code,user_name,user_id,content,idea_id,cid,chapter_name,wk_flag,sar_public_idea_all.state,sar_public_idea_all.cause,sar_public_idea_all.source_type as sourceType
        FROM sar_public_idea_all
        left join ts_user on ts_user.USID=sar_public_idea_all.user_id
        left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
+        left join ts_institution t2 on ts_institution.parent_id=t2.id
+        left join ts_institution t3 on t2.parent_id=t3.id
        WHERE sar_public_idea_all.idea_id = #{cid}
        <if test="null!=type and type != ''">
            and sar_public_idea_all.wk_flag ='1' and sar_public_idea_all.state in ('1','2')
@@ -66,11 +72,13 @@
    </select>

    <select id="getPublicAllIdeaExport" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
-        SELECT sar_public_idea_all.id,reason,ts_institution.name as
+        SELECT sar_public_idea_all.id,reason,concat(t3.name,'_',t2.name,'_',ts_institution.name) as
        deptName,old_text,new_text,dept_id,part_code,user_name,user_id,content,idea_id,cid,chapter_name,wk_flag,sar_public_idea_all.state,sar_public_idea_all.cause,sar_public_idea_all.source_type as sourceType
        FROM sar_public_idea_all
        left join ts_user on ts_user.USID=sar_public_idea_all.user_id
        left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
+        left join ts_institution t2 on ts_institution.parent_id=t2.id
+        left join ts_institution t3 on t2.parent_id=t3.id
        WHERE cid = #{cid}
        <if test="null==type or ''==type">
            and sar_public_idea_all.wk_flag is null
@@ -209,7 +209,12 @@
        LEFT JOIN sar_stand_attr_info AS attr on attr.STAND_ID=warning.STAND_ID
        <where>
            POWER = '1'
-            AND (MARK = 'stand')
+            <if test="waringEO.mark != null and waringEO.mark != ''">
+                AND (MARK = #{mark})
+            </if>
+            <if test="waringEO.mark == null or waringEO.mark == ''">
+                AND (MARK = 'stand')
+            </if>
            AND sarInfo.VALID_FLAG='0'
            <include refid="stand_where"/>
            <if test="waringEO.applyType != null and waringEO.applyType != ''">AND attr.CLLX LIKE CONCAT('%',
@@ -255,7 +260,12 @@
        LEFT JOIN sar_stand_items AS items ON items.ID = warning.ITEM_ID
        <where>
            POWER = '1'
-            AND (MARK = 'item')
+            <if test="waringEO.mark != null and waringEO.mark != ''">
+                AND (MARK = #{mark})
+            </if>
+            <if test="waringEO.mark == null or waringEO.mark == ''">
+                AND (MARK = 'item')
+            </if>
            AND sarInfo.VALID_FLAG='0'
            <include refid="stand_where"/>
            <if test="waringEO.applyType != null and waringEO.applyType != ''">
@@ -4,7 +4,7 @@

    <insert id="ignoreInsert" parameterType="java.util.LinkedList">

-        REPLACE  INTO sar_stand_warning (ID,STAND_ID,ITEMS_ID,POLICY_ID,MARK,POWER)
+        REPLACE  INTO sar_stand_warning (ID,STAND_ID,ITEM_ID,POLICY_ID,MARK,POWER)
        VALUES
        <if test="warningEOS !=null and warningEOS.size()!=0">
            <foreach collection="warningEOS" item="item" index="index"  separator=",">
@@ -21,26 +21,11 @@
    </insert>
    <delete id="autoCancelWarning">
        UPDATE sar_stand_warning
-        SET POWER ='0'
+            SET POWER ='0'
        WHERE
-        STAND_ID IN (
-        SELECT
-        law_id
-        FROM
-        warning_date
-        WHERE
-        DATE_FORMAT(SSRQ, '%Y-%m-%d') &lt; DATE_FORMAT(now(), '%Y-%m-%d')
-
-        )
+        STAND_ID IN ( SELECT law_id FROM warning_date WHERE DATE_FORMAT(SSRQ, '%Y-%m-%d') &lt; DATE_FORMAT(now(), '%Y-%m-%d'))
        OR
-        ITEMS_ID IN (
-        SELECT
-        ITEM_ID
-        FROM
-        warning_date
-        WHERE
-        DATE_FORMAT(SSRQ, '%Y-%m-%d') &lt; DATE_FORMAT(now(), '%Y-%m-%d')
-        )
+        ITEM_ID IN ( SELECT ITEM_ID FROM warning_date WHERE DATE_FORMAT(SSRQ, '%Y-%m-%d') &lt; DATE_FORMAT(now(), '%Y-%m-%d') AND ITEM_ID IS NOT NULL )
    </delete>


@@ -21,44 +21,59 @@
            SELECT c.* FROM (
            SELECT
                (@i:=@i+1) as rows,
-                id,
-                INTERPRETATION_TIME,
-                STAND_NUMBER,
-                specific_item,
-                compared_with_previous,
-                CREATION_USER,
-                CREATION_TIME,
-                VALID_FLAG,
-                LAST_VERSION_NUMBER,
-                risk_degree,
-                compliance_state,
-                INTERPRETATION_STATE,
-                STAND_TYPE,
-                MODIFY_TIME,
-                STAND_SORT,
-                STAND_ID,
-                STAND_NAME,
-                core_technical_requirement
+                sins.id,
+                sins.INTERPRETATION_TIME,
+                sins.STAND_NUMBER,
+                sins.specific_item,
+                sins.compared_with_previous,
+                sins.CREATION_USER,
+                sins.CREATION_TIME,
+                sins.VALID_FLAG,
+                sins.LAST_VERSION_NUMBER,
+                sins.risk_degree,
+                sins.compliance_state,
+                sins.INTERPRETATION_STATE,
+                sins.STAND_TYPE,
+                sins.MODIFY_TIME,
+                sins.STAND_SORT,
+                sins.STAND_ID,
+                sins.STAND_NAME,
+                sins.core_technical_requirement,
+                ssi.APPLY_ARCTIC as applyArctic,
+                ssi.COMPLIANCE_REQUIR as compliianceRequir,
+                ssi.RESPONSIBLE_UNIT as responseibleUnit,
+                ssi.TERMS_CONDITIONS as termsConditions,
+                ssi.MAINPOINTS_IMPEMENTATION as mainpointsImpementation,
+                ssi.SVPPS as svpps,
+                ssi.FILE_TYPE as fileType,
+                ssi.XCXSSRQ as xccssrq,
+                ssi.ZCCSSRQ as zccssrq,
+                ssi.compliance_state as complianceStateSSI,
+                ssi.compared_with_previous as compareWithPrevious,
+                ssi.core_technical_requirement as coreTechnicalRequirementSSI,
+                ssi.read_content as readContent
            FROM
-                sar_interpretation_national_standard ,(SELECT @i:=0)j
+                sar_interpretation_national_standard sins
+                LEFT JOIN sar_stand_items ssi ON ssi.STAND_ID=sins.STAND_ID
+                and ssi.ITEMS_NUM =sins.specific_item,(SELECT @i:=0)j
            WHERE
                1=1
                <if test="interpretationTime!=null ">
-                   and INTERPRETATION_TIME = #{interpretationTime}
+                   and sins.INTERPRETATION_TIME = #{interpretationTime}
                </if>
                <if test="standId!=null and standId!=''">
-                    AND STAND_ID = #{standId}
+                    AND sins.STAND_ID = #{standId}
                </if>
                <if test="standNumber!=null and standNumber!=''">
-                    AND STAND_NUMBER like concat(concat('%',#{standNumber}),'%')
+                    AND sins.STAND_NUMBER like concat(concat('%',#{standNumber}),'%')
                </if>
                <if test="standName!=null and standName!=''">
-                    AND STAND_NAME like concat(concat('%',#{standName}),'%')
+                    AND sins.STAND_NAME like concat(concat('%',#{standName}),'%')
                </if>
                <if test="specificItem!=null and specificItem!=''">
-                    AND specific_item like concat(concat('%',#{specificItem}),'%')
+                    AND sins.specific_item like concat(concat('%',#{specificItem}),'%')
                </if>
-                ORDER BY STAND_ID, specific_item
+                ORDER BY sins.STAND_ID, sins.specific_item

                ) c  ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.specific_item,1,(SELECT LOCATE('.',CONCAT(c.specific_item,'.')))),SIGNED) ,rows
                LIMIT ${(current-1)*size},${size}
@@ -5,15 +5,18 @@
    <select id="getData" resultType="com.adc.da.slrs.wgCommittee.entity.WgCommitteeDTO">
        SELECT wg_committee.id, wg_committee.committee_name as committeeName ,wg_committee.committee_director as committeeDirector
        ,t1.UNAME as committeeDirectorName,wg_committee.committee_secretary as committeeSecretary,t2.UNAME as committeeSecretaryName,
-        wg_committee.committeer , wg_committee_user.committer_id as committorId
+        wg_committee.committeer , wg_committee_user.committer_id as committorId ,wg_committee.committee_deputy as committeeDeputy,
+        t3.UNAME as committeeDeputyName
        from wg_committee
        LEFT JOIN wg_committee_user ON wg_committee.committeer = wg_committee_user.id
        LEFT JOIN ts_user t1 on t1.USID = wg_committee.committee_director
        LEFT JOIN ts_user t2 on t2.USID = wg_committee.committee_secretary
+        LEFT JOIN ts_user t3 on t3.USID = wg_committee.committee_deputy
        where 1=1
        <if test="committeeName != null and ''!=committeeName">
            and wg_committee.committee_name like concat(concat('%',#{committeeName}),'%')
        </if>
+        order by create_time desc
        limit ${(page-1)*pageSize},${pageSize}
    </select>

@@ -31,16 +34,19 @@
    <select id="getDataWk" resultType="com.adc.da.slrs.wgCommittee.entity.WgCommitteeDTO">
        SELECT wg_committee.id, wg_committee.committee_name as committeeName ,wg_committee.committee_director as committeeDirector
        ,t1.UNAME as committeeDirectorName,wg_committee.committee_secretary as committeeSecretary,t2.UNAME as committeeSecretaryName,
-        t3.UNAME as committor,t3.USID as committorId,wg_committee.committeer ,
+        t3.UNAME as committor,t3.USID as committorId,wg_committee.committeer ,wg_committee.committee_deputy as committeeDeputy,
+        t4.UNAME as committeeDeputyName
        from wg_committee
        LEFT JOIN ts_user t1 on t1.USID = wg_committee.committee_director
        LEFT JOIN ts_user t2 on t2.USID = wg_committee.committee_secretary
        LEFT JOIN wg_committee_user on wg_committee_user.id = wg_committee.committeer
        LEFT JOIN ts_user t3 on t3.USID = wg_committee_user.committer_id
+        LEFT JOIN ts_user t4 on t4.USID = wg_committee.committee_deputy
        where 1=1
        <if test="committeeName != null and ''!=committeeName">
            and wg_committee.committee_name like concat(concat('%',#{committeeName}),'%')
        </if>
+        order by create_time desc
        limit ${(page-1)*pageSize},${pageSize}
    </select>