cq

master/src/main/java/com/ruoyi/project/affair/domain/TOfficesupply.java

@@ -18,7 +18,7 @@ public class TOfficesupply extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** id */
-    private String id;
+    private Long id;
 
     /** 装置 */
     @Excel(name = "装置名称", dictType = "PLANT_DIVIDE")
@@ -98,12 +98,12 @@ public class TOfficesupply extends BaseEntity
         this.deptName = deptName;
     }
 
-    public void setId(String id)
+    public void setId(Long id)
     {
         this.id = id;
     }
 
-    public String getId()
+    public Long getId()
     {
         return id;
     }

master/src/main/java/com/ruoyi/project/production/service/impl/TWsglServiceImpl.java

@@ -106,8 +106,10 @@ public class TWsglServiceImpl implements ITWsglService
             all += tWsgl.getSep();
             num ++;
         }
-        long avr = all/num;
-        tWsgl.setAverage(String.valueOf(avr));
+        if (all != 0 && num > 0) {
+            long avr = all/num;
+            tWsgl.setAverage(String.valueOf(avr));
+        }
         return tWsglMapper.insertTWsgl(tWsgl);
     }
 

master/src/main/resources/mybatis/production/TWsglMapper.xml

@@ -109,18 +109,18 @@
             <if test="wsno != null and wsno != ''">#{wsno},</if>
             <if test="owner != null">#{owner},</if>
             <if test="year != null">#{year},</if>
-             #{jan},
-             #{feb},
-             #{mar},
-             #{apr},
-             #{may},
-             #{jun},
-             #{jul},
-             #{aug},
-             #{sep},
-             #{oct},
-             #{nov},
-             #{dec},
+            <if test="jan != null">#{jan},</if>
+            <if test="feb != null">#{feb},</if>
+            <if test="mar != null">#{mar},</if>
+            <if test="apr != null">#{apr},</if>
+            <if test="may != null">#{may},</if>
+            <if test="jun != null">#{jun},</if>
+            <if test="jul != null">#{jul},</if>
+            <if test="aug != null">#{aug},</if>
+            <if test="sep != null">#{sep},</if>
+            <if test="oct != null">#{oct},</if>
+            <if test="nov != null">#{nov},</if>
+            <if test="dec != null">#{dec},</if>
             <if test="average != null">#{average},</if>
             <if test="item != null">#{item},</if>
             <if test="delFlag != null">#{delFlag},</if>

ui/src/views/affair/intercom/index.vue

@@ -283,6 +283,9 @@ export default {
         serialnumber: [
           { required: true, message: this.$t('序号') + this.$t('不能为空'), trigger: "blur" }
         ],
+        deptId: [
+          { required: true, message: this.$t('部门编号') + this.$t('不能为空'), trigger: "blur" }
+        ]
       }
     };
   },

ui/src/views/affair/officesupply/index.vue

@@ -293,6 +293,9 @@
         serialnumber: [
           { required: true, message: this.$t('序号') + this.$t('不能为空'), trigger: "blur" }
         ],
+        deptId: [
+          { required: true, message: this.$t('部门编号') + this.$t('不能为空'), trigger: "blur" }
+        ]
       }
     };
   },

ui/src/views/affair/ppe/index.vue

@@ -296,6 +296,9 @@ export default {
         quantity: [
           { required: true, message: this.$t('数量') + this.$t('不能为空'), trigger: "blur" }
         ],
+        deptId: [
+          { required: true, message: this.$t('部门编号') + this.$t('不能为空'), trigger: "blur" }
+        ]
       }
     };
   },

ui/src/views/components/Production/wsgl.vue

@@ -355,7 +355,7 @@
           wsno: [
             { required: true, message: this.$t('编号') + this.$t('不能为空'), trigger: "blur" }
           ],
-          deptCode: [
+          deptId: [
             { required: true, message: this.$t('部门编号') + this.$t('不能为空'), trigger: "blur" }
           ],
         }

ui/src/views/components/Reliability/preventivemaintenance.vue

@@ -459,6 +459,9 @@
           plantCode: [
             { required: true, message: this.$t('装置名称') + this.$t('不能为空'), trigger: "change" }
           ],
+          item: [
+            { required: true, message: this.$t('类型') + this.$t('不能为空'), trigger: "change" }
+          ],
           deptId: [
             { required: true, message: this.$t('部门编号') + this.$t('不能为空'), trigger: "blur" }
           ]

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

@@ -370,6 +370,12 @@ export default {
         plantCode: [
           { required: true, message: this.$t('装置编号') + this.$t('不能为空'), trigger: "change" }
         ],
+        inspector: [
+          { required: true, message: this.$t('检查人') + this.$t('不能为空'), trigger: "blur" }
+        ],
+        inspectdate: [
+          { required: true, message: this.$t('检查日期') + this.$t('不能为空'), trigger: "blur" }
+        ],
         deptId: [
           { required: true, message: this.$t('部门编号') + this.$t('不能为空'), trigger: "blur" }
         ],
@@ -515,9 +521,9 @@ export default {
               this.getList();
             });
           }
-          if (this.form.inspectstatus == 12) {
+          /*if (this.form.inspectstatus == 12) {
             this.$router.push("/production/accident");
-          }
+          }*/
         }
       });
     },

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

@@ -334,6 +334,9 @@ export default {
         plantCode: [
           { required: true, message: this.$t('装置') + this.$t('不能为空'), trigger: "change" }
         ],
+        deptId: [
+          { required: true, message: this.$t('部门编号') + this.$t('不能为空'), trigger: "blur" }
+        ]
       }
     };
   },

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

@@ -401,6 +401,9 @@ export default {
         plantCode: [
           { required: true, message:  this.$t('装置') + this.$t('不能为空'), trigger: "change" }
         ],
+        deptId: [
+          { required: true, message: this.$t('部门编号') + this.$t('不能为空'), trigger: "blur" }
+        ]
       }
     };
   },

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

@@ -364,6 +364,9 @@ export default {
         plantCode: [
           { required: true, message: this.$t('装置') + this.$t('不能为空'), trigger: "change" }
         ],
+        deptId: [
+          { required: true, message: this.$t('部门编号') + this.$t('不能为空'), trigger: "blur" }
+        ]
       }
     };
   },

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

@@ -316,6 +316,9 @@ export default {
         plantCode: [
           { required: true, message: this.$t('装置') + this.$t('不能为空'), trigger: "change" }
         ],
+        deptId: [
+          { required: true, message: this.$t('部门编号') + this.$t('不能为空'), trigger: "blur" }
+        ]
       }
     };
   },

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

@@ -384,6 +384,12 @@ export default {
         plantCode: [
           { required: true, message: this.$t('装置') +this.$t('不能为空'), trigger: "change" }
         ],
+        inspector: [
+          { required: true, message: this.$t('检查人') + this.$t('不能为空'), trigger: "blur" }
+        ],
+        inspectdate: [
+          { required: true, message: this.$t('检查日期') + this.$t('不能为空'), trigger: "blur" }
+        ],
         deptId: [
           { required: true, message: this.$t('部门编号') + this.$t('不能为空'), trigger: "blur" }
         ],
@@ -530,9 +536,9 @@ export default {
               this.getList();
             });
           }
-          if (this.form.inspectstatus == 12) {
+          /*if (this.form.inspectstatus == 12) {
             this.$router.push("/production/accident");
-          }
+          }*/
         }
       });
     },

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

@@ -364,6 +364,12 @@ export default {
         plantCode: [
           { required: true, message: this.$t('装置') + this.$t('不能为空'), trigger: "change" }
         ],
+        inspector: [
+          { required: true, message: this.$t('检查人') + this.$t('不能为空'), trigger: "blur" }
+        ],
+        inspectdate: [
+          { required: true, message: this.$t('检查日期') + this.$t('不能为空'), trigger: "blur" }
+        ],
         deptId: [
           { required: true, message: this.$t('部门编号') + this.$t('不能为空'), trigger: "blur" }
         ],
@@ -505,9 +511,9 @@ export default {
               this.getList();
             });
           }
-          if (this.form.inspectstatus == 12) {
+          /*if (this.form.inspectstatus == 12) {
             this.$router.push("/production/accident");
-          }
+          }*/
         }
       });
     },

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

@@ -370,6 +370,9 @@ export default {
         inspectdate: [
           { required: true, message: this.$t('检查日期') + this.$t('不能为空'), trigger: "blur" }
         ],
+        deptId: [
+          { required: true, message: this.$t('部门编号') + this.$t('不能为空'), trigger: "blur" }
+        ],
       }
     };
   },
@@ -512,9 +515,9 @@ export default {
               this.getList();
             });
           }
-          if (this.form.inspectstatus == 12) {
+          /*if (this.form.inspectstatus == 12) {
             this.$router.push("/production/accident");
-          }
+          }*/
         }
       });
     },

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

@@ -374,6 +374,9 @@ export default {
         inspectdate: [
           { required: true, message: this.$t('检查日期') + this.$t('不能为空'), trigger: "blur" }
         ],
+        deptId: [
+          { required: true, message: this.$t('部门编号') + this.$t('不能为空'), trigger: "blur" }
+        ],
       }
     };
   },
@@ -516,9 +519,9 @@ export default {
               this.getList();
             });
           }
-          if (this.form.inspectstatus == 12) {
+          /*if (this.form.inspectstatus == 12) {
             this.$router.push("/production/accident");
-          }
+          }*/
         }
       });
     },

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

@@ -364,9 +364,15 @@ export default {
         plantCode: [
           { required: true, message: this.$t('装置') + this.$t('不能为空'), trigger: "change" }
         ],
+        inspector: [
+          { required: true, message: this.$t('检查人') + this.$t('不能为空'), trigger: "blur" }
+        ],
         inspectdate: [
           { required: true, message: this.$t('检查日期') + this.$t('不能为空'), trigger: "blur" }
         ],
+        deptId: [
+          { required: true, message: this.$t('部门编号') + this.$t('不能为空'), trigger: "blur" }
+        ],
       }
     };
   },
@@ -509,9 +515,9 @@ export default {
               this.getList();
             });
           }
-          if (this.form.inspectstatus == 12) {
+          /*if (this.form.inspectstatus == 12) {
             this.$router.push("/production/accident");
-          }
+          }*/
         }
       });
     },

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

@@ -364,6 +364,15 @@ export default {
         plantCode: [
           { required: true, message: this.$t('装置') + this.$t('不能为空'), trigger: "change" }
         ],
+        inspector: [
+          { required: true, message: this.$t('检查人') + this.$t('不能为空'), trigger: "blur" }
+        ],
+        inspectdate: [
+          { required: true, message: this.$t('检查日期') + this.$t('不能为空'), trigger: "blur" }
+        ],
+        deptId: [
+          { required: true, message: this.$t('部门编号') + this.$t('不能为空'), trigger: "blur" }
+        ],
       }
     };
   },
@@ -506,9 +515,9 @@ export default {
               this.getList();
             });
           }
-          if (this.form.inspectstatus == 12) {
+          /*if (this.form.inspectstatus == 12) {
             this.$router.push("/production/accident");
-          }
+          }*/
         }
       });
     },

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

@@ -463,7 +463,7 @@
           rcCode: [
             { required: true, message: this.$t('序号') + this.$t('不能为空'), trigger: "blur" }
           ],
-          menuid: [
+          menuName: [
             { required: true, message: this.$t('目录') + "ID" + this.$t('不能为空'), trigger: "blur" }
           ],
           nameCn: [

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

@@ -300,6 +300,9 @@ export default {
         plantCode: [
           { required: true, message: this.$t('装置') + this.$t('不能为空'), trigger: "change" }
         ],
+        deptId: [
+          { required: true, message: this.$t('部门编号') + this.$t('不能为空'), trigger: "blur" }
+        ]
       }
     };
   },

ui/src/views/process/alarmmodify/index.vue

@@ -437,6 +437,9 @@
           plantCode: [
             { required: true, message: this.$t('装置名称') + this.$t('不能为空'), trigger: "change" }
           ],
+          deptId: [
+            { required: true, message: this.$t('部门编号') + this.$t('不能为空'), trigger: "blur" }
+          ]
         }
       };
     },

ui/src/views/process/moc/index.vue

@@ -775,6 +775,9 @@ export default {
         ],
         trueState: [
           { required: true, message: this.$t('实施情况') + this.$t('不能为空'), trigger: "change" }
+        ],
+        deptId: [
+          { required: true, message: this.$t('部门编号') + this.$t('不能为空'), trigger: "blur" }
         ]
       },
       chooseRules: {
@@ -817,11 +820,17 @@ export default {
         sopUpdate: [
           { required: true, message: this.$t('SOP更新') + this.$t('不能为空'), trigger: "blur" }
         ],
+        deptId: [
+          { required: true, message: this.$t('部门编号') + this.$t('不能为空'), trigger: "blur" }
+        ]
       },
       temporaryRules: {
         overTime: [
           { required: true, message: this.$t('到期时间') + this.$t('不能为空'), trigger: "blur" }
         ],
+        deptId: [
+          { required: true, message: this.$t('部门编号') + this.$t('不能为空'), trigger: "blur" }
+        ]
       },
     };
   },

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

@@ -356,6 +356,15 @@
         form: {},
         // 表单校验
         rules: {
+          year: [
+            { required: true, message: this.$t('年份') + this.$t('不能为空'), trigger: "blur" }
+          ],
+          courseCode: [
+            { required: true, message: this.$t('课程代码') + this.$t('不能为空'), trigger: "blur" }
+          ],
+          item: [
+            { required: true, message: this.$t('课程名称') + this.$t('不能为空'), trigger: "blur" }
+          ],
           deptId: [
             { required: true, message: this.$t('部门编号')+ this.$t('不能为空'), trigger: "blur" }
           ],