Merge branch 'develop_master' into FOTON

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java

@@ -53,12 +53,15 @@ public class EsRevisePlan extends BasePage {
 
 
     @ApiModelProperty(value = "起草人姓名")
+    @TableField(exist = false)
     private String drafterName;
 
     @ApiModelProperty(value = "评审责任人姓名")
+    @TableField(exist = false)
     private String resPersonName;
 
     @ApiModelProperty(value = "工作组组长姓名")
+    @TableField(exist = false)
     private String wgLeaderName;
 
     @ApiModelProperty(value = "计划标准初稿完成时间")
@@ -75,26 +78,33 @@ public class EsRevisePlan extends BasePage {
     private String unit;
 
     @ApiModelProperty(value = "起草责任单位名称")
+    @TableField(exist = false)
     private String unitName;
 
     @ApiModelProperty(value = "引入企业标准json(标准id)")
     private String rqbJson;
     @ApiModelProperty(value = "引入企业标准json(标准名称)")
+    @TableField(exist = false)
     private String rqbName;
     @ApiModelProperty(value = "引入企业标准json(标准编号)")
+    @TableField(exist = false)
     private String rqbCode;
     @ApiModelProperty(value = "体系结构树（id存储方式是逗号拼接）")
     private String tsJson;
     @ApiModelProperty(value = "体系结构树（名称逗号拼接展示）")
+    @TableField(exist = false)
     private String tsJsonName;
     @ApiModelProperty(value = "标准范围")
     private String area;
     @ApiModelProperty(value = "标准范围")
+    @TableField(exist = false)
     private String areaName;
     //企标类别
+    @TableField(exist = false)
     private String standType;
 
     // 标准编号
+    @TableField(exist = false)
     private String standNum;
 
 
@@ -109,6 +119,7 @@ public class EsRevisePlan extends BasePage {
     @TableField("use_level")
     private String useLevel;
 
+    @TableField(exist = false)
     private String useLevelName;
 
     @ApiModelProperty(value = "简述技术指标依据")

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java

@@ -75,7 +75,7 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
         if (esRevisePlans.size()>0){
             return "企标名称不能重复,请更换新的企标名称。";
         }else {
-            esRevisePlanDao.updateOne(esRevisePlan);
+            esRevisePlanDao.updateById(esRevisePlan);
             return "操作成功";
         }
     }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java

@@ -125,6 +125,36 @@ public class SarStandProjectLibraryController extends BaseController<SarStandPro
         return Result.success("200",pageres);
     }
 
+    /**
+     *
+     * @param current
+     * @param pageSize
+     * @return
+     * @author zj
+     * date 2021-07-13
+     **/
+    @GetMapping("/queryProjectManagerXL")
+    @ApiOperation("查询产品线项目经理")
+    public ResponseMessage queryProjectManagerXL(@RequestParam(defaultValue = "1", value = "current")int current, @RequestParam(defaultValue = "10", value = "PageSize") int pageSize, standDTO standDTO){
+        IPage<SarStandProjectLibrary> list1 = sarStandProjectLibraryService.queryProjectManagerXL(current,pageSize, standDTO);
+        // 创建一个新的list集合，用于存储去重后的元素
+        List<productLineDto> listTemp = new ArrayList();
+        for (SarStandProjectLibrary sarStandProjectLibrary:list1.getRecords()){
+            productLineDto p = new productLineDto();
+            p.setProductLine(sarStandProjectLibrary.getProductLine());
+            List<SarStandProjectLibrary> list2 = sarStandProjectLibraryService.queryByProductLineXL(sarStandProjectLibrary.getProductLine());
+            p.setSarStandProjectLibraries(list2);
+            listTemp.add(p);
+        }
+        IPage<productLineDto> pageres=new Page<>();
+        pageres.setRecords(listTemp);
+        pageres.setPages(list1.getPages());
+        pageres.setTotal(list1.getTotal());
+        pageres.setCurrent(list1.getCurrent());
+        pageres.setSize(list1.getSize());
+        return Result.success("200",pageres);
+    }
+
     @GetMapping("/queryProjectUnderLine")
     @ApiOperation("查询产品线项目经理")
     public ResponseMessage queryProjectUnderLine(@RequestParam(defaultValue = "1", value = "current")int current,

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

@@ -19,7 +19,9 @@ public interface SarStandProjectLibraryService {
     Map<String, Object> solostar();
     List<SarStandProjectLibrary> queryById(String id);
     IPage<SarStandProjectLibrary> queryProjectManager(int current, int pageSize, standDTO standDTO);
+    IPage<SarStandProjectLibrary> queryProjectManagerXL(int current, int pageSize, standDTO standDTO);
     List<SarStandProjectLibrary> queryByProductLine(String productLine);
+    List<SarStandProjectLibrary> queryByProductLineXL(String productLine);
     List<SarStandProjectLibrary> queryStandId(String standId);
     IPage<StandAttrInfoDto> queryStandInfo(int current, int pageSize, String standId, String cars);
 

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

@@ -332,6 +332,29 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
         System.out.println("总页数"+userIPage.getPages());
         return userIPage;
     }
+
+    @Override
+    public IPage<SarStandProjectLibrary> queryProjectManagerXL(int current, int pageSize, standDTO standDTO) {
+        StringBuilder stringBuilder=new StringBuilder();
+        stringBuilder.append("where 1=1 ");
+        if (null!=standDTO.getUname() && !"".equals(standDTO.getUname())){
+            stringBuilder.append("and s.NAME like '%"+standDTO.getUname()+"%' ");
+        }
+        if (null!=standDTO.getProductLine() && !"".equals(standDTO.getProductLine())){
+            stringBuilder.append("and sar_stand_project_library.product_line like '%"+standDTO.getProductLine()+"%' ");
+        }
+
+        QueryWrapper<SarStandProjectLibrary> wrapper = new QueryWrapper<>();
+        wrapper.select("distinct product_line");
+        wrapper.last("inner join sar_stand_project_team s on s.project_code = sar_stand_project_library.project_number" +
+                " and sar_stand_project_library.product_line IS not NULL "+stringBuilder.toString());
+        Page<SarStandProjectLibrary> page = new Page<>(current, pageSize);
+        IPage<SarStandProjectLibrary> userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper);
+        System.out.println("总条数"+userIPage.getTotal());
+        System.out.println("总页数"+userIPage.getPages());
+        return userIPage;
+    }
+
     @Override
     public List<SarStandProjectLibrary> queryByProductLine(String productLine) {
         QueryWrapper<SarStandProjectLibrary> wrapper = new QueryWrapper<>();
@@ -339,6 +362,15 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
         List<SarStandProjectLibrary> list = sarStandProjectLibraryDao.selectList(wrapper);
         return list;
     }
+
+    @Override
+    public List<SarStandProjectLibrary> queryByProductLineXL(String productLine) {
+        QueryWrapper<SarStandProjectLibrary> wrapper = new QueryWrapper<>();
+        wrapper.select("distinct project_number,project_name");
+        wrapper.eq("product_line",productLine);
+        List<SarStandProjectLibrary> list = sarStandProjectLibraryDao.selectList(wrapper);
+        return list;
+    }
     @Override
     public List<SarStandProjectLibrary> queryStandId(String standId) {
         QueryWrapper<SarStandProjectLibrary> wrapper = new QueryWrapper<>();

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java

@@ -13,6 +13,7 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -98,6 +99,9 @@ public class SarStandUnqualifiedController extends BaseController<SarStandUnqual
     @ApiOperation("分页查询未符合项")
     @GetMapping
     public ResponseMessage<IPage<SarStandUnqualified>> getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage){
+        if (StringUtils.isNotBlank(sarStandUnqualifiedPage.getProductName())) {
+            sarStandUnqualifiedPage.setProductName(sarStandUnqualifiedPage.getProductName().trim());
+        }
         IPage<SarStandUnqualified> sarStandUnqualifiedIPage=sarStandUnqualifiedService.getSarStandUnqualifiedPage(sarStandUnqualifiedPage);
         return Result.success(sarStandUnqualifiedIPage);
     }

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

@@ -160,7 +160,7 @@ public class SarStandUnqualified extends BaseEntity {
     private Date planCloseTime;
 
 
-    @ExcelProperty("计划关闭时间")
+    @ExcelProperty("整改完成时间")
     @ApiModelProperty(value = "计划关闭时间excel导出")
 
     @TableField(exist = false)

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java

@@ -125,5 +125,11 @@ public class SarInterpretationNationalStandard extends BaseEntity {
     private String coreTechnicalRequirementSSI;
     @TableField(exist = false)
     private String readContent;
+    @TableField(exist = false)
+    private String itemName;
+    @TableField(exist = false)
+    private String dutyEngineer;
+    @TableField(exist = false)
+    private String complianceRequire;
 
 }

adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml

@@ -304,25 +304,25 @@
     <update id="updateOne" parameterType="com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan">
         update es_revise_plan
         <set>
-            <if test="id != null and id != ''">
+            <if test="id != null">
                 id = #{id},
             </if>
-            <if test="esName != null and esName != ''">
+            <if test="esName != null">
                 es_name = #{esName},
             </if>
-            <if test="planStatus != null and planStatus != ''">
+            <if test="planStatus != null">
                 plan_status = #{planStatus},
             </if>
-            <if test="reviseStatus != null and reviseStatus != ''">
+            <if test="reviseStatus != null">
                 revise_status = #{reviseStatus},
             </if>
-            <if test="drafter != null and drafter != ''">
+            <if test="drafter != null">
                 drafter = #{drafter},
             </if>
-            <if test="resPerson != null and resPerson != ''">
+            <if test="resPerson != null">
                 res_person = #{resPerson},
             </if>
-            <if test="wgLeader != null and wgLeader != ''">
+            <if test="wgLeader != null">
                 wg_leader = #{wgLeader},
             </if>
             <if test="draftTime != null">
@@ -331,37 +331,37 @@
             <if test="releaseTime != null">
                 release_time = #{releaseTime},
             </if>
-            <if test="unit != null and unit != ''">
+            <if test="unit != null">
                 unit = #{unit},
             </if>
-            <if test="rqbJson != null and rqbJson != ''">
+            <if test="rqbJson != null">
                 rqb_json=#{rqbJson},
             </if>
-            <if test="tsJson != null and tsJson != ''">
+            <if test="tsJson != null">
                 ts_json=#{tsJson},
             </if>
-            <if test="area != null and area != ''">
+            <if test="area != null">
                 area=#{area},
             </if>
-            <if test="esMatingRelations != null and esMatingRelations != ''">
+            <if test="esMatingRelations != null">
                 es_mating_relations=#{esMatingRelations},
             </if>
-            <if test="esStandRelations != null and esStandRelations != ''">
+            <if test="esStandRelations != null">
                 es_stand_relations=#{esStandRelations},
             </if>
-            <if test="isRelate != null and isRelate != ''">
+            <if test="isRelate != null">
                 is_relate=#{isRelate},
             </if>
-            <if test="useLevel != null and useLevel != ''">
+            <if test="useLevel != null">
                 use_level=#{useLevel},
             </if>
-            <if test="technologic != null and technologic != ''">
+            <if test="technologic != null">
                 technologic=#{technologic},
             </if>
-            <if test="bussSort != null and bussSort != ''">
+            <if test="bussSort != null">
                 buss_sort=#{bussSort},
             </if>
-            <if test="lxd != null and lxd != ''">
+            <if test="lxd != null">
                 LXD=#{lxd},
             </if>
         </set>

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

@@ -48,7 +48,7 @@
                 and sar_stand_unqualified.STAND_ID = #{sar.standId}
             </if>
             <if test="sar.productName != null and sar.productName != '' ">
-                and sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.productName}),'%')
+                and sar_stand_unqualified.PRODUCT_NAME like concat(concat('%',#{sar.productName}),'%')
             </if>
             <if test="sar.responsibleUnit != null and sar.responsibleUnit != '' ">
                 and ts_institution.name like concat('%',#{sar.responsibleUnit},'%')

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml

@@ -51,7 +51,10 @@
                 ssi.compliance_state as complianceStateSSI,
                 ssi.compared_with_previous as compareWithPrevious,
                 ssi.core_technical_requirement as coreTechnicalRequirementSSI,
-                ssi.read_content as readContent
+                ssi.read_content as readContent,
+                ssi.ITEMS_NAME as itemName,
+                ssi.DUTY_ENGINEER as dutyEngineer,
+                ssi.COMPLIANCE_REQUIR as complianceRequire
             FROM
                 sar_interpretation_national_standard sins
                 LEFT JOIN sar_stand_items ssi ON ssi.STAND_ID=sins.STAND_ID

doc/sql/20220718_表修改.sql

@@ -0,0 +1,20 @@
+//资料中心 附件表字段扩容
+ALTER TABLE `foton_slrs`.`file_material`
+MODIFY COLUMN `attach_file_id` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `data_explain`;
+
+//标准属性修改
+ALTER TABLE `foton_slrs`.`sar_stand_attr_info`
+MODIFY COLUMN `BDTBZH` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `TXLB`;
+
+ALTER TABLE `foton_slrs`.`sar_stand_attr_info`
+MODIFY COLUMN `CBBH` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `SYZD`,
+MODIFY COLUMN `CBCD_` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `CBBH`,
+MODIFY COLUMN `CYZBPM` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `CBCD_`,
+MODIFY COLUMN `BFDTBZ` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `CYZBPM`,
+MODIFY COLUMN `BBFDTBZ` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `BFDTBZ`,
+MODIFY COLUMN `CSZD` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `BBFDTBZ`,
+MODIFY COLUMN `XDB` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `CSZD`,
+MODIFY COLUMN `TXLB` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `XDB`,
+MODIFY COLUMN `DYBXHCAR` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `BDTBZH`,
+MODIFY COLUMN `DYMCCAR` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `DYBXHCAR`,
+MODIFY COLUMN `FBGYWBD` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `DYMCCAR`;