Merge branch 'develop_3' into 'develop_master'

Develop 3

See merge request LiuChao/foton-slrs-system-rest!299

adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java

@@ -159,7 +159,13 @@ public class QualityEvaluationServiceImpl extends ServiceImpl<QualityEvaluationD
                         Collectors.averagingDouble(item ->{
 
                             Double score;
-                            switch (item.getProcessNode()){
+                            String value;
+                            if (item.getProcessNode()==null){
+                                value="";
+                            }else {
+                                value=item.getProcessNode();
+                            }
+                            switch (value){
                                 case "会签征求意见":
                                     score=Double.valueOf(item.getScore()) * 0.3;
                                     break;
@@ -172,6 +178,7 @@ public class QualityEvaluationServiceImpl extends ServiceImpl<QualityEvaluationD
                                 case "标准法规部部长审核":
                                     score=Double.valueOf(item.getScore()) * 0.3;
                                     break;
+
                                 default: score=Double.valueOf(item.getScore());
                             }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java

@@ -51,6 +51,7 @@ public class SarStandUnqualified extends BaseEntity {
     @TableField("STAND_NAME")
     private String standName;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "项目编号")
     @TableField("product_id")
     private String productId;
@@ -146,13 +147,21 @@ public class SarStandUnqualified extends BaseEntity {
     @TableField("DUTY_ENGINEER")
     private String dutyEngineer;
 
-    @ExcelProperty("计划关闭时间")
+    @ExcelIgnore
     @ApiModelProperty(value = "计划关闭时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("PLAN_CLOSE_TIME")
     private Date planCloseTime;
 
+
+    @ExcelProperty("计划关闭时间")
+    @ApiModelProperty(value = "计划关闭时间excel导出")
+
+    @TableField(exist = false)
+    private String planCloseTimeExport;
+
+
     @ExcelIgnore
     @ApiModelProperty(value = "主键")
     @TableId(type = IdType.UUID)

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java

@@ -18,6 +18,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.sql.Timestamp;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -165,6 +167,18 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
             sarStandUnqualifiedQueryWrapper.in("id",standUnqualifiedExcelVO.getIds());
         }
                List<SarStandUnqualified> stand = sarStandUnqualifiedDao.selectList(sarStandUnqualifiedQueryWrapper);
+        //        去掉日期时分秒
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+
+            stand.forEach(item->{
+
+                Optional.ofNullable(item.getPlanCloseTime())
+                        .ifPresent(time ->{
+                            item.setPlanCloseTimeExport(sdf.format(time));
+                        });
+
+            });
+
         List<SarStandUnqualified> a = stand;
         return a;
     }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java

@@ -88,8 +88,19 @@ public class SarStandardsInfoEOPage extends BasePage {
     private String orderBy1 = "SAR_STANDARDS_INFO.issue_time";
     private String order1 = "";
 
-//    zhaokaiyao
+    /**
-    private String textStatus;//文本状态
+     *     zhaokaiyao
+     *     文本状态
+     */
+    private String textStatus;
 
+    /**
+     *  日期范围查询发布日期开始
+     */
+    private String startIssueTime;
 
+    /**
+     *   日期范围查询发布日期结束
+     */
+    private String endIssueTime;
 }

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml

@@ -832,9 +832,19 @@
             <if test="page.standYear != null and page.standYear != ''">
                 and SAR_STANDARDS_INFO.STAND_YEAR = #{page.standYear}
             </if>
+<!--             发布日期日期-->
             <if test="page.issueTime != null and page.issueTime != ''">
                 and DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME  ,'%Y-%m-%d') = #{page.issueTime}
             </if>
+            <!--            范围查询 发布日期日期-->
+            <if test="page.startIssueTime != null and page.startIssueTime != '' and page.endIssueTime != null and page.endIssueTime != ''">
+                and
+                DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME  ,'%Y-%m-%d')
+                between
+                DATE_FORMAT(#{page.startIssueTime}  ,'%Y-%m-%d')
+                and
+                DATE_FORMAT(#{page.endIssueTime}  ,'%Y-%m-%d')
+            </if>
             <!--内容摘要-->
             <if test="page.synopsis != null and page.synopsis != ''" >
                 AND dbms_lob.instr(SYNOPSIS, #{page.synopsis} ,1,1) > 0
@@ -964,6 +974,15 @@
             <if test="issueTime != null and issueTime != ''">
                 and DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME  ,'%Y-%m-%d') = #{issueTime}
             </if>
+
+            <if test="startIssueTime != null and startIssueTime != '' and endIssueTime != null and endIssueTime != ''">
+                and
+                DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME  ,'%Y-%m-%d')
+                between
+                DATE_FORMAT( #{startIssueTime} ,'%Y-%m-%d')
+                and
+                DATE_FORMAT( #{startIssueTime} ,'%Y-%m-%d')
+            </if>
             <!--内容摘要-->
             <if test="synopsis != null and synopsis != ''" >
                 AND dbms_lob.instr(SYNOPSIS, #{synopsis} ,1,1) > 0