LY bug fix

master/src/main/java/com/ruoyi/project/invoice/domain/TInvoiceWorkcontent.java

@@ -48,7 +48,6 @@ public class TInvoiceWorkcontent extends BaseEntity
     private String workType;
 
     /** 风险等级 */
-    @Excel(name = "风险等级")
     private Long riskLevel;
 
     /** 作业内容描述 */

master/src/main/java/com/ruoyi/project/sems/controller/TReportYlgdController.java

@@ -8,15 +8,18 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import com.alibaba.fastjson.JSON;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.framework.config.RuoYiConfig;
-import com.ruoyi.project.sems.domain.ParamData;
-import com.ruoyi.project.sems.domain.TReportThird;
-import com.ruoyi.project.sems.domain.TReportYlrq;
+import com.ruoyi.project.sems.domain.*;
+import com.ruoyi.project.sems.mapper.TReportYlgdMapper;
 import com.ruoyi.project.sems.service.ITReportThirdService;
+import com.ruoyi.project.system.domain.SysDictData;
+import com.ruoyi.project.system.service.ISysDictTypeService;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
@@ -25,7 +28,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.sems.domain.TReportYlgd;
 import com.ruoyi.project.sems.service.ITReportYlgdService;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
@@ -33,6 +35,8 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
+
 /**
  * 压力管道年检报告Controller
  *
@@ -48,6 +52,10 @@ public class TReportYlgdController extends BaseController {
 
     @Autowired
     private ITReportThirdService itReportYlrqThirdService;
+    @Resource
+    private TReportYlgdMapper tReportYlgdMapper;
+    @Autowired
+    private ISysDictTypeService iSysDictTypeService;
 
     /**
      * 导出选中设备
@@ -74,10 +82,10 @@ public class TReportYlgdController extends BaseController {
         Sheet sheet = wb.createSheet("sheet1");
         //设置列的宽度，第一个参数为列的序号，从0开始，第二参数为列宽，单位1/256个字节
         for (int i = 0; i < 27; i++) {
-            if (i == 0 || i == 1 || i == 2 || i == 20 || i == 21 || i ==22 || i == 23 || i == 24 || i == 25 || i == 26) {
+            if (i == 0 || i == 1 || i == 2 || i == 20 || i == 21 || i == 22 || i == 23 || i == 24 || i == 25 || i == 26) {
                 sheet.setColumnWidth(i, 20 * 256);
             } else {
-                sheet.setColumnWidth(i,  10 * 256);
+                sheet.setColumnWidth(i, 10 * 256);
             }
         }
         //设置开始行和开始列
@@ -173,28 +181,28 @@ public class TReportYlgdController extends BaseController {
             if (i == 26) row4.createCell(i).setCellValue("3：不符合要求");
         }
         // 合并单元格
-        sheet.addMergedRegion(new CellRangeAddress(0,1,0,0));
-        sheet.addMergedRegion(new CellRangeAddress(0,1,1,1));
-        sheet.addMergedRegion(new CellRangeAddress(0,1,2,2));
-        sheet.addMergedRegion(new CellRangeAddress(0,1,3,3));
-        sheet.addMergedRegion(new CellRangeAddress(0,1,4,4));
-        sheet.addMergedRegion(new CellRangeAddress(0,1,5,5));
-        sheet.addMergedRegion(new CellRangeAddress(0,1,6,6));
-        sheet.addMergedRegion(new CellRangeAddress(0,1,7,7));
-        sheet.addMergedRegion(new CellRangeAddress(0,0,8,13));
-        sheet.addMergedRegion(new CellRangeAddress(0,1,14,14));
-        sheet.addMergedRegion(new CellRangeAddress(0,1,15,15));
-        sheet.addMergedRegion(new CellRangeAddress(0,1,16,16));
-        sheet.addMergedRegion(new CellRangeAddress(0,1,17,17));
-        sheet.addMergedRegion(new CellRangeAddress(0,1,18,18));
-        sheet.addMergedRegion(new CellRangeAddress(0,1,19,19));
-        sheet.addMergedRegion(new CellRangeAddress(0,1,20,20));
-        sheet.addMergedRegion(new CellRangeAddress(0,1,21,21));
-        sheet.addMergedRegion(new CellRangeAddress(0,1,22,22));
-        sheet.addMergedRegion(new CellRangeAddress(0,1,23,23));
-        sheet.addMergedRegion(new CellRangeAddress(0,1,24,24));
-        sheet.addMergedRegion(new CellRangeAddress(0,1,25,25));
-        sheet.addMergedRegion(new CellRangeAddress(0,1,26,26));
+        sheet.addMergedRegion(new CellRangeAddress(0, 1, 0, 0));
+        sheet.addMergedRegion(new CellRangeAddress(0, 1, 1, 1));
+        sheet.addMergedRegion(new CellRangeAddress(0, 1, 2, 2));
+        sheet.addMergedRegion(new CellRangeAddress(0, 1, 3, 3));
+        sheet.addMergedRegion(new CellRangeAddress(0, 1, 4, 4));
+        sheet.addMergedRegion(new CellRangeAddress(0, 1, 5, 5));
+        sheet.addMergedRegion(new CellRangeAddress(0, 1, 6, 6));
+        sheet.addMergedRegion(new CellRangeAddress(0, 1, 7, 7));
+        sheet.addMergedRegion(new CellRangeAddress(0, 0, 8, 13));
+        sheet.addMergedRegion(new CellRangeAddress(0, 1, 14, 14));
+        sheet.addMergedRegion(new CellRangeAddress(0, 1, 15, 15));
+        sheet.addMergedRegion(new CellRangeAddress(0, 1, 16, 16));
+        sheet.addMergedRegion(new CellRangeAddress(0, 1, 17, 17));
+        sheet.addMergedRegion(new CellRangeAddress(0, 1, 18, 18));
+        sheet.addMergedRegion(new CellRangeAddress(0, 1, 19, 19));
+        sheet.addMergedRegion(new CellRangeAddress(0, 1, 20, 20));
+        sheet.addMergedRegion(new CellRangeAddress(0, 1, 21, 21));
+        sheet.addMergedRegion(new CellRangeAddress(0, 1, 22, 22));
+        sheet.addMergedRegion(new CellRangeAddress(0, 1, 23, 23));
+        sheet.addMergedRegion(new CellRangeAddress(0, 1, 24, 24));
+        sheet.addMergedRegion(new CellRangeAddress(0, 1, 25, 25));
+        sheet.addMergedRegion(new CellRangeAddress(0, 1, 26, 26));
         // 表头样式
         for (int i = 0; i < 26; i++) {
             if (i < 3) {
@@ -375,7 +383,51 @@ public class TReportYlgdController extends BaseController {
     @Log(title = "压力管道年检报告", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TReportYlgd tReportYlgd) {
-        return toAjax(tReportYlgdService.updateTReportYlgd(tReportYlgd));
+        tReportYlgdService.updateTReportYlgd(tReportYlgd);
+        new Thread(() -> {
+            sysnReport(String.valueOf(tReportYlgd.getId()));
+        }, "压力管道年检报告修改同步").start();
+        return AjaxResult.success();
+    }
+
+    /**
+     * 同步数据
+     *
+     * @param ids
+     */
+    public void sysnReport(Object[] ids) {
+        List<SysDictData> con = iSysDictTypeService.selectDictDataByType("REPORT_CON");
+        for (Object id : ids
+        ) {
+            TReportYlgd tReportYlgd = tReportYlgdService.selectTReportYlgdById(Long.parseLong(id.toString()));
+            if (StringUtils.isNotEmpty(tReportYlgd.getCon())) {
+                for (SysDictData c : con) {
+                    if (tReportYlgd.getCon().equals(c.getDictValue())) {
+                        tReportYlgd.setCon(c.getDictLabel());
+                    }
+                }
+            }
+            tReportYlgdMapper.sysnReport(tReportYlgd);
+        }
+    }
+
+    /**
+     * 同步数据
+     *
+     * @param id
+     */
+    public void sysnReport(String id) {
+        List<SysDictData> con = iSysDictTypeService.selectDictDataByType("REPORT_CON");
+
+        TReportYlgd tReportYlgd = tReportYlgdService.selectTReportYlgdById(Long.parseLong(id));
+        if (StringUtils.isNotEmpty(tReportYlgd.getCon())) {
+            for (SysDictData c : con) {
+                if (tReportYlgd.getCon().equals(c.getDictValue())) {
+                    tReportYlgd.setCon(c.getDictLabel());
+                }
+            }
+        }
+        tReportYlgdMapper.sysnReport(tReportYlgd);
     }
 
     /**
@@ -509,6 +561,7 @@ public class TReportYlgdController extends BaseController {
         }
         int successNumber = 0;
         int failNum = 0;
+        CopyOnWriteArrayList<String> ids = new CopyOnWriteArrayList();
         for (TReportYlgd t : list
         ) {
             failNum++;
@@ -516,12 +569,16 @@ public class TReportYlgdController extends BaseController {
                 //根据使用证、注册编号、位号，进行数据更新
                 this.tReportYlgdService.updateForImport(t);
                 successNumber++;
+                ids.add(t.getId().toString());
             } catch (Exception e) {
                 failNumber++;
                 logger.info("e:" + e);
                 failRow.add(failNum + 1);
             }
         }
+        new Thread(() -> {
+            sysnReport(ids.toArray());
+        }, "压力管道年检报告修改同步").start();
         logger.info("list:" + JSON.toJSONString(list));
         logger.info("successNumber:" + String.valueOf(successNumber));
         logger.info("failNumber:" + String.valueOf(failNumber));

master/src/main/java/com/ruoyi/project/sems/controller/TReportYlrqController.java

@@ -8,15 +8,19 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import com.alibaba.fastjson.JSON;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.framework.config.RuoYiConfig;
-import com.ruoyi.project.sems.domain.ParamData;
-import com.ruoyi.project.sems.domain.TReportThird;
-import com.ruoyi.project.sems.domain.TSpecdevCc;
+import com.ruoyi.project.sems.domain.*;
+import com.ruoyi.project.sems.mapper.TReportYlgdMapper;
+import com.ruoyi.project.sems.mapper.TReportYlrqMapper;
 import com.ruoyi.project.sems.service.ITReportThirdService;
+import com.ruoyi.project.system.domain.SysDictData;
+import com.ruoyi.project.system.service.ISysDictTypeService;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
@@ -25,7 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.sems.domain.TReportYlrq;
 import com.ruoyi.project.sems.service.ITReportYlrqService;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
@@ -33,6 +36,8 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
+
 /**
  * 压力容器年检报告Controller
  *
@@ -48,6 +53,10 @@ public class TReportYlrqController extends BaseController {
 
     @Autowired
     private ITReportThirdService itReportYlrqThirdService;
+    @Resource
+    private TReportYlrqMapper tReportYlrqMapper;
+    @Autowired
+    private ISysDictTypeService iSysDictTypeService;
 
     /**
      * 导出选中设备
@@ -566,6 +575,7 @@ public class TReportYlrqController extends BaseController {
         }
         int successNumber = 0;
         int failNum = 0;
+        CopyOnWriteArrayList<String> ids = new CopyOnWriteArrayList();
         for (TReportYlrq t : list
         ) {
             failNum++;
@@ -573,12 +583,16 @@ public class TReportYlrqController extends BaseController {
                 //根据使用证、注册编号、位号，进行数据更新
                 this.tReportYlrqService.updateForImport(t);
                 successNumber++;
+                ids.add(t.getId().toString());
             } catch (Exception e) {
                 failNumber++;
                 logger.info("e:" + e);
                 failRow.add(failNum + 1);
             }
         }
+        new Thread(() -> {
+            sysnReport(ids.toArray());
+        }, "压力容器年检报告修改同步").start();
         logger.info("list:" + JSON.toJSONString(list));
         logger.info("successNumber:" + String.valueOf(successNumber));
         logger.info("failNumber:" + String.valueOf(failNumber));
@@ -612,7 +626,50 @@ public class TReportYlrqController extends BaseController {
     @Log(title = "压力容器年检报告", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TReportYlrq tReportYlrq) {
-        return toAjax(tReportYlrqService.updateTReportYlrq(tReportYlrq));
+        tReportYlrqService.updateTReportYlrq(tReportYlrq);
+        new Thread(() -> {
+            sysnReport(String.valueOf(tReportYlrq.getId()));
+        }, "压力容器年检报告修改同步").start();
+        return AjaxResult.success();
+    }
+
+    /**
+     * 同步数据
+     *
+     * @param ids
+     */
+    public void sysnReport(Object[] ids) {
+        List<SysDictData> con = iSysDictTypeService.selectDictDataByType("REPORT_CON");
+        for (Object id : ids
+        ) {
+            TReportYlrq tReportYlrq = tReportYlrqService.selectTReportYlrqById(Long.parseLong(id.toString()));
+            if (StringUtils.isNotEmpty(tReportYlrq.getCon())) {
+                for (SysDictData c : con) {
+                    if (tReportYlrq.getCon().equals(c.getDictValue())) {
+                        tReportYlrq.setCon(c.getDictLabel());
+                    }
+                }
+            }
+            tReportYlrqMapper.sysnReport(tReportYlrq);
+        }
+    }
+
+    /**
+     * 同步数据
+     *
+     * @param id
+     */
+    public void sysnReport(String id) {
+        List<SysDictData> con = iSysDictTypeService.selectDictDataByType("REPORT_CON");
+            TReportYlrq tReportYlrq = tReportYlrqService.selectTReportYlrqById(Long.parseLong(id.toString()));
+            if (StringUtils.isNotEmpty(tReportYlrq.getCon())) {
+                for (SysDictData c : con) {
+                    if (tReportYlrq.getCon().equals(c.getDictValue())) {
+                        tReportYlrq.setCon(c.getDictLabel());
+                    }
+                }
+            tReportYlrqMapper.sysnReport(tReportYlrq);
+        }
     }
 
     /**

master/src/main/java/com/ruoyi/project/sems/his/controller/TSpechiYlrqController.java

@@ -123,6 +123,7 @@ public class TSpechiYlrqController extends BaseController
     {
         return toAjax(tSpechiYlrqService.deleteTSpechiYlrqByIds(ids));
     }
+
     public void addOperLog(Object[] ids, String userName, Date operTime , String operType){
         for (Object id: ids
         ) {

master/src/main/java/com/ruoyi/project/sems/mapper/TReportYlgdMapper.java

@@ -109,4 +109,6 @@ public interface TReportYlgdMapper {
      * @return 结果
      */
     public int deleteTReportYlgdByIds(Long[] ids);
+
+    int sysnReport(TReportYlgd tReportYlgd);
 }

master/src/main/java/com/ruoyi/project/sems/mapper/TReportYlrqMapper.java

@@ -109,4 +109,6 @@ public interface TReportYlrqMapper extends BaseMapper<TReportYlrq> {
      * @return 结果
      */
     public int deleteTReportYlrqByIds(Long[] ids);
+
+    void sysnReport(TReportYlrq tReportYlrq);
 }

master/src/main/resources/mybatis/sems/TReportYlgdMapper.xml

@@ -137,6 +137,17 @@
     </select>
 
     <update id="updateForImport">
+        <selectKey keyProperty='id' resultType='Long' order='BEFORE'>
+            SELECT
+            (select id
+            from t_specdev_ylgd
+            where devno = #{devno}
+            and useno = #{useno}
+            and regno = #{regno}
+            and rownum=1 and del_flag = 0
+            ) id
+            from DUAL
+        </selectKey>
         update t_report_ylgd
         <trim prefix="SET" suffixOverrides=",">
             <if test="pj1 != null">pj1 = #{pj1},</if>
@@ -172,6 +183,7 @@
         where devno = #{devno}
         and useno = #{useno}
         and regno = #{regno}
+        and del_flag = 0
         )
         <!-- where dev_id = ( -->
         <!-- select id -->
@@ -264,6 +276,9 @@
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="yearWarnDate != null">check_date = #{yearWarnDate},</if>
+            <if test="yearNextWarnDate != null">next_check_date = #{yearNextWarnDate},</if>
+            <if test="checkConclusion != null">con = #{checkConclusion},</if>
         </trim>
         where id = #{id}
     </update>
@@ -404,6 +419,18 @@
         where id = #{id}
     </update>
 
+
+    <update id="sysnReport" parameterType="TReportYlgd">
+        update t_specdev_ylgd
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="yearReportNo != null">year_report_no = #{yearReportNo},</if>
+            <if test="checkDate != null">year_warn_date = #{checkDate},</if>
+            <if test="nextCheckDate != null">year_next_warn_date = #{nextCheckDate},</if>
+            <if test="con != null">check_conclusion = #{con},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
     <update id="deleteTReportYlgdById" parameterType="Long">
         update t_report_ylgd
         set del_flag = 2

master/src/main/resources/mybatis/sems/TReportYlrqMapper.xml

@@ -241,11 +241,25 @@
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="yearReportNo != null">year_report_no = #{yearReportNo},</if>
+            <if test="yearWarnDate != null">check_date = #{yearWarnDate},</if>
+            <if test="yearNextWarnDate != null">next_check_date = #{yearNextWarnDate},</if>
+            <if test="checkConclusion != null">con = #{checkConclusion},</if>
         </trim>
         where id = #{id}
     </update>
 
     <update id="updateForImport">
+        <selectKey keyProperty='id' resultType='Long' order='BEFORE'>
+            SELECT
+            (select id
+            from t_specdev_ylrq
+            where devno = #{devno}
+            and useno = #{useno}
+            and regno = #{regno}
+            and rownum=1 and del_flag = 0
+            ) id
+            from DUAL
+        </selectKey>
         update t_report_ylrq
         <trim prefix="SET" suffixOverrides=",">
             <if test="pj1 != null">pj1 = #{pj1},</if>
@@ -492,4 +506,15 @@
         </foreach>
     </delete>
 
+    <update id="sysnReport" parameterType="TReportYlrq">
+        update t_specdev_ylrq
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="yearReportNo != null">year_report_no = #{yearReportNo},</if>
+            <if test="checkDate != null">year_warn_date = #{checkDate},</if>
+            <if test="nextCheckDate != null">year_next_warn_date = #{nextCheckDate},</if>
+            <if test="con != null">check_conclusion = #{con},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
 </mapper>

ui/src/views/approve/approveDetail/invoice-detail.vue

@@ -17,7 +17,6 @@
               </template>
             </el-table-column>
             <el-table-column label="作业类型" align="center" prop="workType" :formatter="workTypeFormat"/>
-            <el-table-column label="风险等级" align="center" prop="riskLevel" :formatter="riskLevelFormat"/>
             <el-table-column label="作业内容描述" align="center" prop="workDescription"/>
             <el-table-column label="作业人员数" align="center" prop="workPeopleNumber"/>
             <el-table-column label="预计作业时间" align="center" prop="estimateWorktime"/>
@@ -192,18 +191,6 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item label="风险等级" prop="riskLevel">
-                <el-select v-model="ruleForm.riskLevel" placeholder="请选择风险等级" clearable size="small">
-                  <el-option
-                    v-for="dict in riskLevelOptions"
-                    :key="dict.dictValue"
-                    :label="dict.dictLabel"
-                    :value="parseInt(dict.dictValue)"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
             <el-col :span="6">
               <el-form-item label="作业人数" prop="workPeopleNumber">
                 <el-input-number v-model="ruleForm.workPeopleNumber" :min="1" :max="999" ></el-input-number>
@@ -283,9 +270,6 @@ export default {
         workDescription: [
           {required: true, message: "作业内容不能为空", trigger: "change"}
         ],
-        riskLevel: [
-          {required: true, message: "风险等级不能为空", trigger: "change"}
-        ],
         workPeopleNumber: [
           {required: true, message: "作业人数不能为空", trigger: "change"}
         ],

ui/src/views/invoice/bookingworkticket/index.vue

@@ -170,7 +170,7 @@
         </template>
       </u-table-column>
       <u-table-column label="作业类型" align="center" prop="workType" width="120" :show-overflow-tooltip="true" :formatter="workTypeFormat"/>
-      <u-table-column label="风险等级" align="center" prop="riskLevel" width="60" :formatter="riskLevelFormat"/>
+
       <u-table-column label="作业内容描述" align="center" prop="workDescription" width="160" :show-overflow-tooltip="true"/>
       <u-table-column label="作业人员数" align="center" prop="workPeopleNumber" width="70" :show-overflow-tooltip="true"/>
       <u-table-column label="预计作业时间" align="center" prop="estimateWorktime" width="70" :show-overflow-tooltip="true"/>
@@ -399,18 +399,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item label="风险等级" prop="riskLevel">
-                <el-select v-model="ruleForm.riskLevel" placeholder="请选择风险等级" clearable size="small">
-                  <el-option
-                    v-for="dict in riskLevelOptions"
-                    :key="dict.dictValue"
-                    :label="dict.dictLabel"
-                    :value="parseInt(dict.dictValue)"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
+
             <el-col :span="6">
               <el-form-item label="作业人数" prop="workPeopleNumber">
                 <el-input-number v-model="ruleForm.workPeopleNumber" :min="1" :max="999" ></el-input-number>
@@ -749,9 +738,6 @@ export default {
           {required: true, message: "作业内容不能为空", trigger: "change"},
           {validator: this.checkSame, trigger: 'blur'}
         ],
-        riskLevel: [
-          {required: true, message: "风险等级不能为空", trigger: "change"}
-        ],
         workPeopleNumber: [
           {required: true, message: "作业人数不能为空", trigger: "change"}
         ],
@@ -1065,10 +1051,6 @@ export default {
     workTypeFormat(row, column) {
       return this.selectDictLabels(this.workTypeOptions, row.workType);
     },
-    // 风险等级字典翻译
-    riskLevelFormat(row, column) {
-      return this.selectDictLabel(this.riskLevelOptions, row.riskLevel);
-    },
     // 火票级别字典翻译
     hpjbFormat(row, column) {
       return this.selectDictLabel(this.hpjbOptions, row.hpjb);
@@ -1430,7 +1412,7 @@ export default {
     //合并单元格
     mergeMethod({row, column, rowIndex, columnIndex}) {
       // console.log(row)
-      if ([1, 2, 3, 4, 5, 11, 12, 13, 14, 28].includes(columnIndex)) {
+      if ([1, 2, 3, 4, 5, 10, 11, 12, 13, 27].includes(columnIndex)) {
         const _row = this.setTable(this.bookingworkticketList).merge[rowIndex];
         const _col = _row > 0 ? 1 : 0;
         return {

ui/src/views/invoice/workcontent/index.vue

@@ -40,15 +40,6 @@
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>
-      <el-form-item label="风险等级" prop="riskLevel">
-        <el-input
-          v-model="queryParams.riskLevel"
-          placeholder="请输入风险等级"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="作业内容描述" prop="workDescription">
         <el-input
           v-model="queryParams.workDescription"
@@ -175,7 +166,6 @@
         </template>
       </el-table-column>
       <el-table-column label="作业类型" align="center" prop="workType" :show-overflow-tooltip="true"/>
-      <el-table-column label="风险等级" align="center" prop="riskLevel" :show-overflow-tooltip="true"/>
       <el-table-column label="作业内容描述" align="center" prop="workDescription" :show-overflow-tooltip="true"/>
       <el-table-column label="作业人员数" align="center" prop="workPeopleNumber" :show-overflow-tooltip="true"/>
       <el-table-column label="监护人单位" align="center" prop="guardianUnit" :show-overflow-tooltip="true"/>
@@ -246,9 +236,6 @@
             <el-option label="请选择字典生成" value="" />
           </el-select>
         </el-form-item>
-        <el-form-item label="风险等级" prop="riskLevel">
-          <el-input v-model="form.riskLevel" placeholder="请输入风险等级" />
-        </el-form-item>
         <el-form-item label="作业内容描述" prop="workDescription">
           <el-input v-model="form.workDescription" placeholder="请输入作业内容描述" />
         </el-form-item>

ui/src/views/login.vue

@@ -63,18 +63,18 @@
 <!--          <span v-else>{{ $t('login.loading') }}</span>-->
 <!--        </el-button>-->
 <!--      </el-form-item>-->
-      <el-form-item style="width:100%;">
-        <el-button
-          :loading="loading"
-          size="medium"
-          type="primary"
-          style="width:100%;"
-          @click.native.prevent="doAzureLogin"
-        >
-          <span v-if="!loading"> Azure登录 </span>
-          <span v-else>{{ $t('login.loading') }}</span>
-        </el-button>
-      </el-form-item>
+<!--      <el-form-item style="width:100%;">-->
+<!--        <el-button-->
+<!--          :loading="loading"-->
+<!--          size="medium"-->
+<!--          type="primary"-->
+<!--          style="width:100%;"-->
+<!--          @click.native.prevent="doAzureLogin"-->
+<!--        >-->
+<!--          <span v-if="!loading"> Azure登录 </span>-->
+<!--          <span v-else>{{ $t('login.loading') }}</span>-->
+<!--        </el-button>-->
+<!--      </el-form-item>-->
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">

ui/src/views/sems/reportYlgd/index.vue

@@ -856,8 +856,8 @@ export default {
         approveStatus: null,
         pageNum: 1,
         pageSize: 20,
-        orderByColumn: "unit",
-        isAsc: "asc",
+        orderByColumn: null,
+        isAsc: null,
       },
       // 查询历史报告参数
       queryHistoryParams: {

ui/src/views/sems/reportYlrq/index.vue

@@ -1074,8 +1074,8 @@ export default {
         devno: null,
         pageNum: 1,
         pageSize: 20,
-        orderByColumn:"unit",
-        isAsc:"asc",
+        orderByColumn: null,
+        isAsc: null,
       },
       // 查询参数
       queryHistoryParams: {