LY byx

master/src/main/java/com/ruoyi/project/ehs/controller/TJobticketController.java

@@ -188,6 +188,9 @@ public class TJobticketController extends BaseController {
     @Log(title = "工作票", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TJobticket tJobticket) {
+        if (StringUtils.isEmpty(tJobticket.getWhgzxkzh()) && StringUtils.isEmpty(tJobticket.getDhzyxkzh()) &&StringUtils.isEmpty(tJobticket.getXzkjxkzh()) &&StringUtils.isEmpty(tJobticket.getMbzyxkzh()) &&StringUtils.isEmpty(tJobticket.getGczyxkzh()) ){
+            return AjaxResult.error("票号不能为空");
+        }
         if (tJobticket.getXpxp() != null && tJobticket.getXpxp().equals("12")) {
             int i = tJobticketMapper.countXp(tJobticket);
             logger.info("预约票数量:" + i);
@@ -287,6 +290,9 @@ public class TJobticketController extends BaseController {
     @Log(title = "工作票", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TJobticket tJobticket) {
+        if (StringUtils.isEmpty(tJobticket.getWhgzxkzh()) && StringUtils.isEmpty(tJobticket.getDhzyxkzh()) &&StringUtils.isEmpty(tJobticket.getXzkjxkzh()) &&StringUtils.isEmpty(tJobticket.getMbzyxkzh()) &&StringUtils.isEmpty(tJobticket.getGczyxkzh()) ){
+            return AjaxResult.error("票号不能为空");
+        }
         ISysUserService sysUserService = (ISysUserService) SpringContextUtils.getBean("sysUserService");
         StringBuilder contentUserUnit = new StringBuilder();
         if (tJobticket.getUserUnit() != null) {
@@ -310,6 +316,9 @@ public class TJobticketController extends BaseController {
     @PutMapping("/status")
     public AjaxResult editStatus(@RequestBody TJobticket tJobticket) {
         if ("18".equals(tJobticket.getZypzt())) {
+            if (StringUtils.isEmpty(tJobticket.getWhgzxkzh()) && StringUtils.isEmpty(tJobticket.getDhzyxkzh()) &&StringUtils.isEmpty(tJobticket.getXzkjxkzh()) &&StringUtils.isEmpty(tJobticket.getMbzyxkzh()) &&StringUtils.isEmpty(tJobticket.getGczyxkzh()) ){
+                return AjaxResult.error("票号不能为空");
+            }
             //批量
             return toAjax(tJobticketMapper.updateTJobticketStatus(tJobticket));
         } else {

master/src/main/resources/mybatis/ehs/TJobticketMapper.xml

@@ -336,7 +336,6 @@
             </where>
     </update>
 
-
     <update id="deleteTJobticketById" parameterType="Long">
         update t_jobticket
         set del_flag = 2

master/src/main/resources/mybatis/training/TByxWorkcertificateMapper.xml

@@ -46,7 +46,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTByxWorkcertificateList" parameterType="TByxWorkcertificate" resultMap="TByxWorkcertificateResult">
         <include refid="selectTByxWorkcertificateVo"/>
-        <where>
+        LEFT JOIN t_staffmgr t on d.employeeid = t.staffid and t.del_flag = 0
+        LEFT JOIN SYS_DICT_DATA sdd on t.ACTUALPOST = sdd.DICT_VALUE and sdd.DICT_TYPE = 'ACTUALPOST'
+        LEFT JOIN SYS_DICT_DATA sdd2 on d.classes = sdd2.DICT_VALUE and sdd2.DICT_TYPE = 'TEAM_DIVIDE'
+
+<where>
             <if test="classes != null  and classes != ''"> and classes = #{classes}</if>
             <!-- 王子文 2022年8月15日 -->
             <!-- 过滤掉锅炉证、加氢工艺、裂化工艺字段中值为（一个或多个）空格的数据 -->
@@ -55,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
-        order by d.id desc
+        order by sdd2.DICT_SORT,sdd.DICT_SORT
     </select>
 
     <select id="selectList" parameterType="TByxWorkcertificate" resultMap="TByxWorkcertificateResult">

master/src/main/resources/mybatis/training/TByxWorklicenseMapper.xml

@@ -48,7 +48,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTByxWorklicenseList" parameterType="TByxWorklicense" resultMap="TByxWorklicenseResult">
         <include refid="selectTByxWorklicenseVo"/>
-        <where>
+        LEFT JOIN t_staffmgr t on d.employeeid = t.staffid and t.del_flag = 0
+        LEFT JOIN SYS_DICT_DATA sdd on t.ACTUALPOST = sdd.DICT_VALUE and sdd.DICT_TYPE = 'ACTUALPOST'
+        LEFT JOIN SYS_DICT_DATA sdd2 on d.classes = sdd2.DICT_VALUE and sdd2.DICT_TYPE = 'TEAM_DIVIDE'
+
+<where>
             <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>
             <if test="name != null  and name != ''"> and name like concat(concat('%', #{name}), '%')</if>
             <if test="employeeid != null  and employeeid != ''"> and employeeid = #{employeeid}</if>
@@ -86,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
-        order by d.id desc
+        order by sdd2.DICT_SORT,sdd.DICT_SORT
     </select>
 
     <select id="selectList" parameterType="TByxWorklicense" resultMap="TByxWorklicenseResult">

master/src/main/resources/mybatis/training/TTrainingCompanylevelMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.training.mapper.TTrainingCompanylevelMapper">
-    
+
     <resultMap type="TTrainingCompanylevel" id="TTrainingCompanylevelResult">
         <result property="id"    column="id"    />
         <result property="serialNum"    column="serial_num"    />
@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTTrainingCompanylevelList" parameterType="TTrainingCompanylevel" resultMap="TTrainingCompanylevelResult">
         <include refid="selectTTrainingCompanylevelVo"/>
-        <where>  
+        <where>
             <if test="serialNum != null "> and serial_num = #{serialNum}</if>
             <if test="courseCode != null  and courseCode != ''"> and course_code like concat(concat('%', #{courseCode}), '%')</if>
             <if test="item != null  and item != ''"> and item like concat(concat('%', #{item}), '%')</if>
@@ -38,14 +38,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
-        order by d.serial_num asc
+        order by course_code, d.serial_num asc
     </select>
-    
+
     <select id="selectTTrainingCompanylevelById" parameterType="Long" resultMap="TTrainingCompanylevelResult">
         <include refid="selectTTrainingCompanylevelVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTTrainingCompanylevel" parameterType="TTrainingCompanylevel">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_training_companylevel.NEXTVAL as id FROM DUAL
@@ -118,5 +118,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

master/src/main/resources/mybatis/training/TTrainingrecordsMapper.xml

@@ -45,6 +45,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTTrainingrecordsList" parameterType="TTrainingrecords" resultMap="TTrainingrecordsResult">
         <include refid="selectTTrainingrecordsVo"/>
+        LEFT JOIN t_staffmgr t on d.employeeid = t.staffid and t.del_flag = 0
+        LEFT JOIN SYS_DICT_DATA sdd on t.ACTUALPOST = sdd.DICT_VALUE and sdd.DICT_TYPE = 'ACTUALPOST'
+        LEFT JOIN SYS_DICT_DATA sdd2 on d.classes = sdd2.DICT_VALUE and sdd2.DICT_TYPE = 'TEAM_DIVIDE'
+
         <where>
             <if test="year != null "> and year = #{year}</if>
             <if test="name != null  and name != ''"> and name like concat(concat('%', #{name}), '%')</if>
@@ -62,7 +66,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
-        <if test="sortOrder == 'desc'">
+        order by sdd2.DICT_SORT ,sdd.DICT_SORT
+       <!-- <if test="sortOrder == 'desc'">
             <if test="sortDate == 'companysafe'"> ORDER BY companysafe desc</if>
             <if test="sortDate == 'plantsafe'"> ORDER BY plantsafe desc</if>
             <if test="sortDate == 'teamsafe'"> ORDER BY teamsafe desc</if>
@@ -71,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sortDate == 'companysafe'"> ORDER BY companysafe asc</if>
             <if test="sortDate == 'plantsafe'"> ORDER BY plantsafe asc</if>
             <if test="sortDate == 'teamsafe'"> ORDER BY teamsafe asc</if>
-        </if>
+        </if>-->
     </select>
 
     <select id="selectList" parameterType="TTrainingrecords" resultMap="TTrainingrecordsResult">

ui/src/views/ehs/jobticket/index.vue

@@ -225,6 +225,7 @@
              children: 'children',
 
              expandAll: true}"
+             :data-changes-scroll-top =false
               :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
               :default-expand-all=true
                use-virtual
@@ -338,6 +339,7 @@
               @sort-change="sortList"
              use-virtual
              showBodyOverflow="title"
+             :data-changes-scroll-top =false
     >
       <u-table-column :label="$t('开票日期')" align="center" prop="kprq" width="125">
         <template slot-scope="scope">

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

@@ -148,6 +148,7 @@
               :span-method="mergeMethod" @selection-change="handleSelectionChange" :height="clientHeight" border
              use-virtual :row-key="row => { return row.id }"
              showBodyOverflow="title"
+             :data-changes-scroll-top =false
               >
       <u-table-column type="selection" width="55" align="center" :reserve-selection="true"/>
       <u-table-column label="作业单位" align="center" prop="bookingworkticket.workUnit" width="80"
@@ -858,9 +859,8 @@ export default {
       }
       batchAddJobticket(putData).then(response => {
         this.msgSuccess(this.$t(response.msg));
-        this.getList()
+       this.getList()
       });
-
     },
     //根据用户单位 查询对应选择的用户主管  根据用户单位 字段 查找对应的多个主管 返回 Sysuser的集合(id,name)
     checkCategoryPromotion(oneId) {
@@ -1400,11 +1400,10 @@ export default {
             return this.msgError("请至少关联一张许可证号");
           }
           updateWorkcontent(putData).then(response => {
-            //    console.log(response.row)
-
+            this.getList()
           });
           assion(this.associationParams.bookingticketId).then(response => {
-            this.getList()
+
           });
 
           this.msgSuccess("请求成功");

ui/src/views/monitor/elecNew/index.vue

@@ -448,8 +448,8 @@
         this.tabIndex = id;
 
         this.goodSwiper.slideTo(id - 1, 1000, false);
-        this.goodSwiper.autoplay.start();
-        this.swiperAutoText = "暂停轮播";
+        // this.goodSwiper.autoplay.start();
+        // this.swiperAutoText = "暂停轮播";
       },
       instantSwiper() {
         let that = this;

ui/src/views/training/byxWorklicense/index.vue

@@ -993,9 +993,9 @@ export default {
       this.doc.queryParams.pId = row.id
       this.doc.pId = row.id
       this.getFileList()
-      /*this.$nextTick(() => {
+      this.$nextTick(() => {
         this.$refs.doc.clearFiles()
-      })*/
+      })
     },
     getFileList (){
       allFileList(this.doc.queryParams).then(response => {