LY 锁号

master/src/main/java/com/ruoyi/project/apply/controller/TApplyOfflinevalveController.java

@@ -387,6 +387,7 @@ public class TApplyOfflinevalveController extends BaseController {
     public Map<String, Object> getWordData(TApplyOfflinevalve tApplyOfflinevalve) {
         Map<String, Object> params = new HashMap<>();
         params.put("devNo", Texts.of(tApplyOfflinevalve.getDevNo()).fontSize(10).bold().create());
+        params.put("LockNo", Texts.of(tApplyOfflinevalve.getLockNo()).fontSize(10).bold().create());
         params.put("unit", Texts.of(tApplyOfflinevalve.getUnit()).fontSize(10).bold().create());
         params.put("offlineReason", Texts.of(tApplyOfflinevalve.getOfflineReason()).fontSize(10).bold().create());
         params.put("safa", Texts.of(tApplyOfflinevalve.getSafa()).fontSize(10).bold().create());

master/src/main/java/com/ruoyi/project/apply/controller/TApplySafetychangeController.java

@@ -382,6 +382,7 @@ public class TApplySafetychangeController extends BaseController {
      */
     public Map<String, Object> getWordData(TApplySafetychange tApplySafetychange) {
         Map<String, Object> params = new HashMap<>();
+        params.put("LockNo", Texts.of(tApplySafetychange.getLockNo()).fontSize(10).bold().create());
         params.put("changeDescribe", Texts.of(tApplySafetychange.getChangeDescribe()).fontSize(10).bold().create());
         params.put("changeReason", Texts.of(tApplySafetychange.getChangeReason()).fontSize(10).bold().create());
         if (StringUtils.isNotEmpty(tApplySafetychange.getApplicant())) {//申请人

master/src/main/resources/mybatis/plant/TStaffmgrMapper.xml

@@ -272,7 +272,7 @@
         <include refid="selectTStaffmgrVo"/>
         <where>
             and d.del_flag = 9
-            <if test="isRetire != null  and isRetire != ''"> and is_retire = #{isRetire}</if>
+            <if test="isRetire != null"> and is_retire = #{isRetire}</if>
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}

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

@@ -406,7 +406,7 @@
         UPDATE  T_SPECDEV_YLRQ set DEL_FLAG = 2
         where rowid !=( select max(rowid)
         from T_SPECDEV_YLRQ b
-        where b.useno = T_SPECDEV_YLRQ.useno and,b.DEVNO = T_SPECDEV_YLRQ.DEVNO and b.plant_code = T_SPECDEV_YLRQ.plant_code and T_SPECDEV_YLRQ.DEL_FLAG = 0 and b.DEL_FLAG = 0
+        where b.useno = T_SPECDEV_YLRQ.useno and b.DEVNO = T_SPECDEV_YLRQ.DEVNO and b.plant_code = T_SPECDEV_YLRQ.plant_code and T_SPECDEV_YLRQ.DEL_FLAG = 0 and b.DEL_FLAG = 0
         and T_SPECDEV_YLRQ.APPROVE_STATUS = 0
         )
     </update>