cq

master/src/main/java/com/ruoyi/project/plant/controller/TTargetlistController.java

@@ -198,7 +198,7 @@ public class TTargetlistController extends BaseController
                         entity.setTargets(cellValue);//目标
                     } else if (j == 4) {
                         if (cellValue != "") {
-                            entity.setYear(Long.parseLong(cellValue));//年度
+                            entity.setYear(cellValue);//年度
                         }
                     } else if (j == 5) {
                         if (cellValue != "") {

master/src/main/java/com/ruoyi/project/plant/controller/TTargetmeasuresController.java

@@ -274,7 +274,7 @@ public class TTargetmeasuresController extends BaseController
             Template t = dh.getTemplate();
             map.put("year", year);
             TTargetlist targetlist = new TTargetlist();
-            targetlist.setYear(Long.parseLong(year));
+            targetlist.setYear(year);
             targetlist.setParentId(Long.parseLong("0"));
             List<TTargetlist> tTargetlists = tTargetlistService.selectTTargetlistList(targetlist);
             for (TTargetlist list : tTargetlists) {

master/src/main/java/com/ruoyi/project/plant/controller/TTargetreviewController.java

@@ -248,7 +248,7 @@ public class TTargetreviewController extends BaseController
             DocumentHandler dh = new DocumentHandler();
             Template t = dh.getTemplate();
             TTargetlist targetlist = new TTargetlist();
-            targetlist.setYear(Long.parseLong(year));
+            targetlist.setYear(year);
             targetlist.setParentId(Long.parseLong("0"));
             List<TTargetlist> tTargetlists = tTargetlistService.selectTTargetlistList(targetlist);
             for (TTargetlist list : tTargetlists) {

master/src/main/java/com/ruoyi/project/plant/domain/TTargetagreement.java

@@ -24,7 +24,7 @@ public class TTargetagreement extends BaseEntity
 
     /** 年份 */
     @Excel(name = "年份")
-    private Long year;
+    private String year;
 
     /** 员工号 */
     @Excel(name = "员工号")
@@ -82,12 +82,12 @@ public class TTargetagreement extends BaseEntity
     {
         return id;
     }
-    public void setYear(Long year)
+    public void setYear(String year)
     {
         this.year = year;
     }
 
-    public Long getYear()
+    public String getYear()
     {
         return year;
     }

master/src/main/java/com/ruoyi/project/plant/domain/TTargetlist.java

@@ -44,7 +44,7 @@ public class TTargetlist extends BaseEntity
 
     /** 年度 */
     @Excel(name = "年度")
-    private Long year;
+    private String year;
 
     /** 方案/行动计划/措施 */
     @Excel(name = "方案/行动计划/措施")
@@ -238,12 +238,12 @@ public class TTargetlist extends BaseEntity
     {
         return targets;
     }
-    public void setYear(Long year)
+    public void setYear(String year)
     {
         this.year = year;
     }
 
-    public Long getYear()
+    public String getYear()
     {
         return year;
     }

master/src/main/java/com/ruoyi/project/training/controller/TWorklicenseController.java

@@ -77,7 +77,7 @@ public class TWorklicenseController extends BaseController
     {
         List<TWorklicense> list = tWorklicenseService.selectTWorklicenseList(tWorklicense);
         List<TTrainingWorklicense> tTrainingWorklicenses = new ArrayList<TTrainingWorklicense>();
-        if (list.get(0).getBoiler().equals("1")) {
+        if ("1".equals(list.get(0).getBoiler())) {
             TTrainingWorklicense tTrainingWorklicense = new TTrainingWorklicense();
             tTrainingWorklicense.setWorklicenseId(list.get(0).getId());
             tTrainingWorklicense.setId(list.get(0).getId());
@@ -85,7 +85,7 @@ public class TWorklicenseController extends BaseController
             tTrainingWorklicense.setWorklicenseIdnum(list.get(0).getCrackingIdnum());
             tTrainingWorklicenses.add(tTrainingWorklicense);
         }
-        if (list.get(0).getCracking().equals("1")) {
+        if ("1".equals(list.get(0).getCracking())) {
             TTrainingWorklicense tTrainingWorklicense = new TTrainingWorklicense();
             tTrainingWorklicense.setId(list.get(0).getId());
             tTrainingWorklicense.setWorklicenseId(list.get(0).getId());
@@ -93,7 +93,7 @@ public class TWorklicenseController extends BaseController
             tTrainingWorklicense.setWorklicenseIdnum(list.get(0).getCrackingIdnum());
             tTrainingWorklicenses.add(tTrainingWorklicense);
         }
-        if (list.get(0).getHotarea().equals("1")) {
+        if ("1".equals(list.get(0).getHotarea())) {
             TTrainingWorklicense tTrainingWorklicense = new TTrainingWorklicense();
             tTrainingWorklicense.setWorklicenseId(list.get(0).getId());
             tTrainingWorklicense.setId(list.get(0).getId());
@@ -101,7 +101,7 @@ public class TWorklicenseController extends BaseController
             tTrainingWorklicense.setWorklicenseIdnum(list.get(0).getCrackingIdnum());
             tTrainingWorklicenses.add(tTrainingWorklicense);
         }
-        if (list.get(0).getColdarea().equals("1")) {
+        if ("1".equals(list.get(0).getColdarea())) {
             TTrainingWorklicense tTrainingWorklicense = new TTrainingWorklicense();
             tTrainingWorklicense.setWorklicenseId(list.get(0).getId());
             tTrainingWorklicense.setId(list.get(0).getId());

ui/src/views/plant/targetlist/index.vue

@@ -126,12 +126,17 @@
           <el-input v-model="form.targets" :placeholder="$t('请输入') + $t('目标')" />
         </el-form-item>
         <el-form-item :label="$t('年份')" prop="year">
-          <el-input v-model="form.year" :placeholder="$t('请输入') + $t('年份')" />
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.year"
+                          type="year"
+                          value-format="yyyy"
+                          :placeholder="$t('请选择') + $t('年份')">
+          </el-date-picker>
         </el-form-item>
         <el-form-item :label="$t('备注')" prop="remarks">
           <el-input v-model="form.remarks" :placeholder="$t('请输入') + $t('备注')" />
         </el-form-item>
-        <el-form-item :label="$t('备注')" prop="yardstick" v-if="form.parentId !== 0">
+        <el-form-item :label="$t('判断标准')" prop="yardstick" v-if="form.parentId !== 0">
           <el-input v-model="form.yardstick" :placeholder="$t('请输入') + $t('判断标准')" />
         </el-form-item>
         <el-form-item :label="$t('合作者')" prop="partners" v-if="form.parentId !== 0">