Merge branch 'develop_master' into 'FOTON'

Develop master

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

adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java

@@ -41,41 +41,30 @@ public class QualityEvaluationController extends BaseController<QualityEvaluatio
     @ApiOperation("提交评价表")
     @PostMapping("submitEvaluationForm")
     public ResponseMessage submitEvaluationForm(@RequestBody FormVO form){
-        List<QualityEvaluation> tableData = form.getTableData();
-        String standId = form.getStandId();
-        String userId = form.getUserId();
 
-        tableData.forEach(item->{
-            item.setUserId(userId);
-            item.setLawId(standId);
 
-            if (    item.getEvaluationIndex()!=null  && "3U9lb".equals( item.getEvaluationIndex() )   ){
+        if (form.getFormData()!=null && !form.getFormData().isEmpty()){
+            List<QualityEvaluation> tableData = form.getTableData();
+            String lawId = form.getLawId();
+            String userId = form.getUserId();
+            tableData.forEach(item->{
+                item.setUserId(userId);
+                item.setLawId(lawId);
 
-                JSONObject jsonObject = JSONObject.parseObject(form.getFormData());
+                if (    item.getEvaluationIndex()!=null  && "3U9lb".equals( item.getEvaluationIndex() )   ){
-//                switch (item.getScore()){
-//                   case "0":
-//                       item.setScore("-1");
-//                   case "1":
-//                       item.setScore("-2");
-//               }
-               item.setScore(jsonObject.getString("revise"));
-               item.setReason(jsonObject.getString("reviseReason"));
 
-            }
+                    JSONObject jsonObject = JSONObject.parseObject(form.getFormData());
+                    item.setScore(jsonObject.getString("revise"));
+                    item.setReason(jsonObject.getString("reviseReason"));
 
-        });
+                }
 
-//
+            });
-//        Optional.ofNullable(item.getEvaluationIndex())
+        }
-//                .map(u-> {
-//
-//                    return null;
-//                })
-//                .map(a-> {
-//
-//                }).orElseThrow(()->new Exception("取指错误"));
 
-        Boolean i = iQualityEvaluationService.submitEvaluationForm(tableData);
+
+
+        Boolean i = iQualityEvaluationService.submitEvaluationForm(form);
 
         return Result.success(i);
     }
@@ -85,7 +74,11 @@ public class QualityEvaluationController extends BaseController<QualityEvaluatio
     @PostMapping("getEvaluationForm")
     public ResponseMessage getEvaluationForm(@RequestBody FormVO form){
 
+        QualityEvaluation qualityEvaluation = new QualityEvaluation();
+        qualityEvaluation.setLawId(form.getLawId()) ;
+        qualityEvaluation.setUserId(form.getUserId()) ;
 
+        iQualityEvaluationService.getEvaluationForm(qualityEvaluation);
 
         return null;
     }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/FormVO.java

@@ -1,5 +1,8 @@
 package com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 
 import java.util.List;
@@ -7,12 +10,19 @@ import java.util.List;
 @Data
 public class FormVO {
 
+    @ApiModelProperty("提交的评分表")
     private List<QualityEvaluation> tableData;
 
-    private String standId;
+    @ApiModelProperty("企标法规id")
+    @JsonProperty("standId") //前后分离 前端字段
+    private String lawId;
 
+    @ApiModelProperty("提交的用户id")
     private String userId;
 
-
+    @ApiModelProperty("附加")
     private String formData;
+
+    @ApiModelProperty("评分类型")
+    private String evaluationType;
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java

@@ -10,6 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -53,7 +54,7 @@ public class QualityEvaluation extends BaseEntity {
 
     @JsonProperty("indexType")  //前后分离 前端字段
     @TableField("evaluation_type")
-    @ApiModelProperty(value = "评价类型")
+    @ApiModelProperty(value = "评分类型")
     private String evaluationType;
 
     @JsonProperty("commentReason")  //前后分离 前端字段
@@ -66,6 +67,9 @@ public class QualityEvaluation extends BaseEntity {
     @ApiModelProperty(value = "打分")
     private String score;
 
+    @ApiModelProperty(value = "指标值类型")
+    @TableField(exist = false)
+    private String valueType;
 
     @TableField("process_node")
     @ApiModelProperty(value = "流程节点")
@@ -73,11 +77,11 @@ public class QualityEvaluation extends BaseEntity {
 
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @ApiModelProperty(value = "更新时间")
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Date modifyTime;
+    private LocalDateTime modifyTime;
 
 
     @TableField(exist = false)

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

@@ -1,5 +1,6 @@
 package com.adc.da.slrs.sarEnterpriseStandardEvaluation.service;
 
+import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.FormVO;
 import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -17,7 +18,7 @@ import java.util.Map;
  */
 public interface IQualityEvaluationService extends IService<QualityEvaluation> {
 
-    public Boolean submitEvaluationForm(List<QualityEvaluation> form);
+    public Boolean submitEvaluationForm(FormVO form);
 
     public IPage<QualityEvaluation> getHistory(QualityEvaluation query);
 

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

@@ -1,6 +1,7 @@
 package com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.impl;
 
 import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.EvaluationIndex;
+import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.FormVO;
 import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation;
 import com.adc.da.slrs.sarEnterpriseStandardEvaluation.dao.QualityEvaluationDao;
 import com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.IEvaluationIndexService;
@@ -10,14 +11,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.collections.IterableMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.io.PipedReader;
-import java.util.HashMap;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
@@ -38,20 +37,41 @@ public class QualityEvaluationServiceImpl extends ServiceImpl<QualityEvaluationD
 
 
     @Override
-    public Boolean submitEvaluationForm(List<QualityEvaluation> form) {
+    public Boolean submitEvaluationForm(FormVO form) {
-        QueryWrapper<QualityEvaluation> queryWrapper = new QueryWrapper<>();
+
 //
 //        queryWrapper.eq("user_id",form.get)
 //                .eq("evaluation_type","dynamic");
-        this.remove(queryWrapper);
+
-        form.forEach(item->item.setId( UUIDUtils.randomUUID20()));
+        Optional.ofNullable(form.getEvaluationType())
-        return this.saveBatch(form);
+                .ifPresent( item->{
+                    if ("dynamic".equals(form.getEvaluationType())){
+                        QueryWrapper<QualityEvaluation> queryWrapper = new QueryWrapper<>();
+                        queryWrapper.eq("law_id",form.getLawId()) //清除此用户在动态评分中已存在的评分
+                                .eq("user_id",form.getUserId())
+                                .eq("evaluation_type","dynamic");
+                        this.remove(queryWrapper);
+                }
+        });
+
+
+        List<QualityEvaluation> tableData = form.getTableData();
+        tableData.forEach(item->{
+
+            item.setId( UUIDUtils.randomUUID20());
+            if ("number".equals(item.getValueType()) ){
+                item.setScore(String.valueOf (Double.valueOf(item.getScore()) * 2) );
+
+            }
+        });
+        return this.saveBatch(tableData);
     }
 
     @Override
     public IPage<QualityEvaluation> getHistory(QualityEvaluation query) {
         QueryWrapper<QualityEvaluation> queryWrapper = new QueryWrapper<>();
-        Page<QualityEvaluation> page = new Page<>(query.getPage(), query.getPageSize());
+//        Page<QualityEvaluation> page = new Page<>(query.getPage(), query.getPageSize());
+        Page<QualityEvaluation> page = new Page<>(1, 20);
 
 
         if (query.getUserId()!=null){  //指定用户
@@ -63,6 +83,7 @@ public class QualityEvaluationServiceImpl extends ServiceImpl<QualityEvaluationD
             queryWrapper.eq("evaluation_type",query.getEvaluationType());
         }
 
+        //sql计算每个用户的评分
         return qualityEvaluationDao.getHistory(page,queryWrapper);
 
 
@@ -73,16 +94,19 @@ public class QualityEvaluationServiceImpl extends ServiceImpl<QualityEvaluationD
     @Override
     public List<QualityEvaluation> getEvaluationForm(QualityEvaluation query) {
         QueryWrapper<QualityEvaluation> queryWrapper = new QueryWrapper<>();
-        Page<QualityEvaluation> page = new Page<>(query.getPage(), query.getPageSize());
 
-        queryWrapper.select("UNAME as userName","score","reason","create_time","modify_time")
+        queryWrapper.select("UNAME as userName","score","reason","create_time as createTime","modify_time as modifyTime","idx.value_type as valueType")
-                .eq("law_id",query.getLawId()) //企标id
+                .last("JOIN ts_user user ON quality_evaluation.user_id = user.USID" +
-                .last("JOIN ts_user user ON quality_evaluation.user_id = user.USID");
+                        "LEFT JOIN evaluation_index as idx on iex.id=quality_evaluation.evaluation_index");
 
 
+        if (query.getLawId()!=null){
+            queryWrapper.eq("law_id",query.getLawId()); //指定企标id
+        }
+
         if (query.getUserId()!=null){  //指定用户
-            queryWrapper.eq("user_id", query.getUserId())
+            queryWrapper.eq("quality_evaluation.user_id", query.getUserId());
-                    .orderBy(true,true, "crate_time","modify_time");
+
         }
 
         if (query.getEvaluationType()!=null){ //指定评价指标

adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java

@@ -27,17 +27,12 @@ public class IssueTrackServiceImpl extends ServiceImpl<IssueTrackDao, IssueTrack
     @Override
     public boolean addIssueTrack(IssueTrack obj) {
         QueryWrapper<IssueTrack> wrapper = new QueryWrapper<>();
-        wrapper.eq("law_id",obj.getLawId())
+        wrapper.eq("law_id",obj.getLawId());
-                .eq("del_flag","0");
 
-        IssueTrack one = this.getOne(wrapper);
+        obj.setId(UUIDUtils.randomUUID20());
-        if (one==null){
+        obj.setDelFlag("0");
-            return false;
+
-        }else {
+        return this.saveOrUpdate(obj,wrapper);
-            obj.setId(UUIDUtils.randomUUID20());
-            obj.setDelFlag("0");
-            return this.save(obj);
-        }
 
 
     }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java

@@ -379,7 +379,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
 
         QueryWrapper<SarStandardsInfo> wrapper1 = new QueryWrapper<>();
         wrapper1.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_NAME","STAND_EN_NAME","STAND_TYPE","(select count(*) from sar_stand_unqualified" +
-                " where STAND_ID = r.stand_id and CLOSE_STATE = '1' ) as unCount ",
+                " where STAND_ID = r.stand_id and CLOSE_STATE = '1' ) as unCount ","(select count(*) from sar_stand_unqualified" +
+                        " where STAND_ID = r.stand_id and CLOSE_STATE = '2' ) as counts ",
                 "(select GROUP_CONCAT( DISTINCT DATE_FORMAT( PLAN_CLOSE_TIME, '%Y-%m-%d' ) ORDER BY PLAN_CLOSE_TIME )  from sar_stand_unqualified where " +
                 " STAND_ID = r.stand_id and CLOSE_STATE = '1' AND PLAN_CLOSE_TIME is NOT NULL ) as endTimes ");
         wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.project_id ='" + standId + "'");
@@ -408,7 +409,13 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
             p.setStandName(s.getStandName());
             p.setStandType(s.getStandType());
             p.setStandEnName(s.getStandEnName());
-            p.setUnCount(s.getUnCount());
+            if (s.getUnCount()==0L && s.getCounts()>0L) {
+                p.setUnCount(s.getUnCount());
+            }else if (s.getUnCount() == 0L && s.getCounts()==0L){
+                p.setUnCount(2L);
+            }else {
+                p.setUnCount(1L);
+            }
             p.setEndTimes(s.getEndTimes());
             for (SarStandAttrInfo a:list2){
                 if(s.getId().equals(a.getStandId())){

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java

@@ -24,10 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.net.URLEncoder;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 @RestController
 @RequestMapping("/${restPath}/sys/EarlyWarning")
@@ -66,6 +63,16 @@ public class EarlyWarningEOController extends BaseController<EarlyWarningEO> {
     @ApiOperation("标准预警查询")
     public ResponseMessage<IPage<StandWarningEO>> getStandWaring(StandWarningEO queryPageEO){
         IPage<StandWarningEO> standWarning = earlyWarningEOService.getStandWarning(queryPageEO);
+        standWarning.getRecords().forEach(item->{
+
+            Optional.ofNullable(item.getSSRQ())
+                    .ifPresent(SSRQ -> item.setSSRQ(item.getSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", "")));
+            Optional.ofNullable(item.getXCXSSRQ())
+                    .ifPresent(SSRQ ->item.setXCXSSRQ(item.getXCXSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", "")));
+            Optional.ofNullable(item.getZCCSSRQ())
+                    .ifPresent(SSRQ ->item.setZCCSSRQ(item.getZCCSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", "")));
+
+        });
         return Result.success(standWarning);
     }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java

@@ -46,6 +46,7 @@ import java.net.URLEncoder;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
 * <p>
@@ -110,9 +111,24 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
             page.setUserId(LoginUserUtil.getUserId());
         }
         List<SarStandardsInfo> rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page);
+
+//        去掉日期时分秒
+     rows.forEach(item->{
+
+         Optional.ofNullable(item.getSSRQ())
+                 .ifPresent(SSRQ -> item.setSSRQ(item.getSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", "")));
+         Optional.ofNullable(item.getXCXSSRQ())
+                 .ifPresent(SSRQ ->item.setXCXSSRQ(item.getXCXSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", "")));
+         Optional.ofNullable(item.getZCCSSRQ())
+                 .ifPresent(SSRQ ->item.setZCCSSRQ(item.getZCCSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", "")));
+
+     });
+
         return Result.success(getPageInfo(page.getPager(), rows));
     }
 
+
+
     private void nowOrderFunc(SarStandardsInfoEOPage page) {
         switch (page.getNowOrderBy()) {
             case 1:

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

@@ -146,6 +146,10 @@ public class SarStandardsInfo extends BaseEntity {
     @TableField(exist = false)
     private Long unCount;
 
+    @ApiModelProperty(value = "为符合数量")
+    @TableField(exist = false)
+    private Long counts;
+
     @ApiModelProperty(value = "整改完成时间")
     @TableField(exist = false)
     private String endTimes;

adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml

@@ -5,20 +5,20 @@
     <select id="getHistory"
             resultType="com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation">
 
-        SELECT
+		 SELECT
-        	`user`.UNAME AS userName,
+			`user`.UNAME AS userName,
-        	evaluation_index,
+			eva.user_id,
-        	eva.user_id,
+			avg(eva.score * iex.weight) AS score,
-        	avg(eva.score * iex.weight) AS score
+			iex.index_type as valueType
-        FROM
+		FROM
-        	quality_evaluation AS eva
+			quality_evaluation AS eva
-        LEFT JOIN ts_user `user` ON eva.user_id = `user`.USID
+		LEFT JOIN ts_user `user` ON eva.user_id = `user`.USID
-        LEFT JOIN evaluation_index AS iex ON eva.evaluation_index = iex.id
+		LEFT JOIN evaluation_index AS iex ON eva.evaluation_index = iex.id
-        GROUP BY
+		GROUP BY
-        	userName,
+			userName,
-        	evaluation_index,
+			eva.user_id,
-        	eva.user_id,
+			index_type
-	        score
+
         ${ew.customSqlSegment}
     </select>
 </mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml

@@ -61,10 +61,10 @@
         WHERE
 
         <if test="flag == 1">
-            library.id NOT IN ( SELECT project_id FROM sar_stand_project_relation )
+            library.id NOT IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL )
         </if>
         <if test="flag == 2">
-            library.id IN ( SELECT project_id FROM sar_stand_project_relation )
+            library.id IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL )
         </if>
         <if test="flag == 4">
             1=1
@@ -120,10 +120,10 @@
         ON team.project_code = library.project_number
         WHERE
         <if test="flag == 1">
-            library.id NOT IN ( SELECT project_id FROM sar_stand_project_relation )
+            library.id NOT IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL )
         </if>
         <if test="flag == 2">
-            library.id IN ( SELECT project_id FROM sar_stand_project_relation )
+            library.id IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL )
         </if>
         <if test="flag == 4">
             1=1
@@ -185,10 +185,10 @@
         ON team.project_code = library.project_number
         WHERE
         <if test="flag == 1">
-            library.id NOT IN ( SELECT project_id FROM sar_stand_project_relation )
+            library.id NOT IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL )
         </if>
         <if test="flag == 2">
-            library.id IN ( SELECT project_id FROM sar_stand_project_relation )
+            library.id IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL )
         </if>
         <if test="flag == 4">
             1=1

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml

@@ -31,7 +31,7 @@
     </select>
 
 
-    <select id="getSarStandUnqualifiedPage" resultType="com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified">
+    <select id="getSarStandUnqualifiedPageNew" resultType="com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified">
         SELECT
         sar_stand_unqualified.*, sar_standards_info.STAND_TYPE as standType
         from
@@ -49,14 +49,45 @@
             and RESPONSIBLE_UNIT = #{sar.responsibleUnit}
         </if>
         <if test="sar.standSerialNumber != null and sar.standSerialNumber != '' ">
-            and STAND_SERIAL_NUMBER like concat(concat('%',#{sar.standSerialNumber}),'%')
+            and (REPLACE(STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%')
-            or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%')
+            or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%'))
         </if>
         order by sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc
         limit #{start},#{end}
     </select>
 
-    <select id="getSarStandUnqualifiedCount" resultType="java.lang.Integer">
+    <select id="getSarStandUnqualifiedPage" resultType="com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified">
+        SELECT
+        c.*
+        FROM
+        (
+        SELECT b.*,sar_standards_info.STAND_TYPE as standType FROM (
+            SELECT  (@i:=@i+1) as rows,sar_stand_unqualified.*  FROM
+            sar_stand_unqualified,(SELECT @i:=0)j
+            WHERE
+            close_state = 1
+            <if test="sar.standId != null and sar.standId != '' ">
+                and STAND_ID = #{standId}
+            </if>
+            <if test="sar.productName != null and sar.productName != '' ">
+                and PRODUCT_NAME like concat(concat('%',#{sar.productName}),'%')
+            </if>
+            <if test="sar.responsibleUnit != null and sar.responsibleUnit != '' ">
+                and RESPONSIBLE_UNIT = #{sar.responsibleUnit}
+            </if>
+            <if test="sar.standSerialNumber != null and sar.standSerialNumber != '' ">
+                and (REPLACE(STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%')
+                or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%'))
+            </if>
+        order by sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc
+        limit #{start},#{end}
+        )b
+        left join sar_standards_info on b.STAND_ID = sar_standards_info.id
+        )c
+        ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.ITEMS_NUM,1,(SELECT LOCATE('.',CONCAT(c.ITEMS_NUM,'.')))),SIGNED) ,c.rows
+    </select>
+
+    <select id="getSarStandUnqualifiedCountNew" resultType="java.lang.Integer">
         SELECT
          count(sar_stand_unqualified.ID)
         from
@@ -74,8 +105,38 @@
             and RESPONSIBLE_UNIT = #{sar.responsibleUnit}
         </if>
         <if test="sar.standSerialNumber != null and sar.standSerialNumber != '' ">
-            and STAND_SERIAL_NUMBER like concat(concat('%',#{sar.standSerialNumber}),'%')
+            and (REPLACE(STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%')
-            or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%')
+            or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%'))
         </if>
     </select>
+
+    <select id="getSarStandUnqualifiedCount" resultType="java.lang.Integer">
+        SELECT
+        count(c.ID)
+        FROM
+        (
+        SELECT b.*,sar_standards_info.STAND_TYPE as standType FROM (
+        SELECT  (@i:=@i+1) as rows,sar_stand_unqualified.*  FROM
+        sar_stand_unqualified,(SELECT @i:=0)j
+        WHERE
+        close_state = 1
+        <if test="sar.standId != null and sar.standId != '' ">
+            and STAND_ID = #{standId}
+        </if>
+        <if test="sar.productName != null and sar.productName != '' ">
+            and PRODUCT_NAME like concat(concat('%',#{sar.productName}),'%')
+        </if>
+        <if test="sar.responsibleUnit != null and sar.responsibleUnit != '' ">
+            and RESPONSIBLE_UNIT = #{sar.responsibleUnit}
+        </if>
+        <if test="sar.standSerialNumber != null and sar.standSerialNumber != '' ">
+            and (REPLACE(STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%')
+            or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%'))
+        </if>
+        order by sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc
+        )b
+        left join sar_standards_info on b.STAND_ID = sar_standards_info.id
+        )c
+        ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.ITEMS_NUM,1,(SELECT LOCATE('.',CONCAT(c.ITEMS_NUM,'.')))),SIGNED) ,c.rows
+    </select>
 </mapper>

adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java

@@ -161,7 +161,7 @@ public class OCRRestfulServiceImpl implements OCRRestfulService {
         String saveWordFileName=null;
         logger.info("将文件保存至本地");
         if(wordFile!=null && !wordFile.isEmpty()){
-            saveWordFileName=UUIDUtils.randomUUID20()+"_"+wordFile.getOriginalFilename();
+            saveWordFileName=UUIDUtils.randomUUID20()+"_"+wordFile.getOriginalFilename().replace("/","_");
             saveWordFilePath=ocrFilePath+saveWordFileName;
             logger.info(saveWordFilePath);
             //生成保存文件
@@ -175,7 +175,7 @@ public class OCRRestfulServiceImpl implements OCRRestfulService {
         String saveJsonFilePath=null;
         String saveJsonFileName=null;
         if(jsonFile!=null && !jsonFile.isEmpty()){
-            saveJsonFileName=UUIDUtils.randomUUID20()+"_"+jsonFile.getOriginalFilename();
+            saveJsonFileName=UUIDUtils.randomUUID20()+"_"+jsonFile.getOriginalFilename().replace("/","_");
             saveJsonFilePath=ocrFilePath+saveJsonFileName;
             logger.info(saveJsonFilePath);
             File saveJsonFile = new File(saveJsonFilePath);

adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java

@@ -2,6 +2,7 @@ package com.adc.da.sys.entity;
 
 import com.adc.da.base.entity.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -14,6 +15,7 @@ import java.util.List;
  * <b>日期：</b> 2018-09-03 <br>
  * <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
  */
+@Data
 public class UserEO extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 3658632939727891047L;
@@ -32,6 +34,11 @@ public class UserEO extends BaseEntity implements Serializable {
     private String password;
     private String account;
     private String usid;
+    private String sex;
+    private String phone;
+    private String upDeptName;
+    private String upDeptId;
+
     // 扩展字段
     private  String userType;
     private String orgId;
@@ -51,7 +58,8 @@ public class UserEO extends BaseEntity implements Serializable {
     private Integer unlockFlag;
     private String userInfoId;
     private String orgType;
-
+    private String institutionName;
+    private String institutionId;
     private String ssoId;
     private String token;
     /**

adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml

@@ -28,6 +28,10 @@
         <result column="FAX_ADDRESS" property="faxAddress"/>
         <result column="userInfoId" property="userInfoId"/>
         <result column="role_id" property="roleId"/>
+        <result column="INSTITUTION_NAME" property="institutionName"/>
+        <result column="INSTITUTION_ID" property="institutionId"/>
+        <result column="SEX" property="sex"/>
+        <result column="PHONE" property="phone"/>
     </resultMap>
 
     <resultMap id="SSOResultMap" type="com.adc.da.sys.entity.UserEO">
@@ -78,6 +82,7 @@
     <!-- TS_USER table all fields -->
     <sql id="Base_Column_List">
 		usid, account, valid_flag, password, uname, ext_info,email,work_num,creation_time,modify_time,oper_user,user_source,disable_flag,unlock_flag,user_type
+		,INSTITUTION_NAME,INSTITUTION_ID,SEX,PHONE
 	</sql>
 
     <sql id="SSO_Column_List">
@@ -748,9 +753,11 @@
 
     <!-- 根据account获取未逻辑删除的UserEO -->
     <select id="getUserEOByAccountNotDeleted" resultMap="BaseResultMap" parameterType="java.lang.String">
-        select
+        select usid, account, valid_flag, password, uname, ext_info,email,work_num,creation_time,modify_time,oper_user,user_source,disable_flag,unlock_flag,user_type
-        <include refid="Base_Column_List"/>
+		,INSTITUTION_NAME,INSTITUTION_ID,SEX,PHONE,ts_institution.name as upDeptName,ts_institution.id as upDeptId
-        from TS_USER where account = #{account} and VALID_FLAG != 1
+        from TS_USER
+        left join ts_institution ON ts_institution.id = (SELECT parent_id from ts_institution WHERE id = ts_user.INSTITUTION_ID)
+        where account = #{account} and VALID_FLAG != 1
     </select>
 
     <select id="getNamesByIds" resultType="java.lang.String" parameterType="java.util.List">