cq

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

@@ -76,6 +76,9 @@ public class TStaffmgrController extends BaseController
     @Autowired
     private ITTrainingService tTrainingService;
 
+    @Autowired
+    private ITTrainingNonService tTrainingNonService;
+
     /**
      * 查询人员管理列表
      */
@@ -320,6 +323,11 @@ public class TStaffmgrController extends BaseController
                                 tTrainingDevice.setSupplementary("2");
                                 tTrainingDeviceService.insertTTrainingDevice(tTrainingDevice);
                             }
+                            TTrainingNon tTrainingNon = new TTrainingNon();
+                            tTrainingNon.setStaffId(tStaffmgr.getStaffid());
+                            tTrainingNon.setTrainingId(training.getId());
+                            tTrainingNon.setIsNew("1");
+                            tTrainingNonService.insertTTrainingNon(tTrainingNon);
                         }
                     }
                 }
@@ -378,6 +386,23 @@ public class TStaffmgrController extends BaseController
                 tTrainingrecords.setDelFlag(2l);
                 tTrainingrecordsService.updateTTrainingrecords(tTrainingrecords);
             }
+            TStaffmgr staffmgr = tStaffmgrService.selectTStaffmgrById(ids[i]);
+            TTrainingDevice device = new TTrainingDevice();
+            device.setStaffId(staffmgr.getStaffid());
+            List<TTrainingDevice> devices = tTrainingDeviceService.selectTTrainingDeviceList(device);
+            Long[] devicesIds = new Long[devices.size()];
+            for (int m = 0; m < devices.size(); m++) {
+                devicesIds[m] = devices.get(m).getId();
+            }
+            tTrainingDeviceService.deleteTTrainingDeviceByIds(devicesIds);
+            TTrainingNon non = new TTrainingNon();
+            non.setStaffId(staffmgr.getStaffid());
+            List<TTrainingNon> nons = tTrainingNonService.selectTTrainingNonList(non);
+            Long[] nonIds = new Long[nons.size()];
+            for (int n = 0; n < nons.size(); n++) {
+                nonIds[n] = nons.get(n).getId();
+            }
+            tTrainingNonService.deleteTTrainingNonByIds(nonIds);
         }
         return toAjax(tStaffmgrService.deleteTStaffmgrByIds(ids));
     }

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

@@ -81,24 +81,26 @@ public class TTargetagreementController extends BaseController
         List<SysDictData> partnersDict = iSysDictTypeService.selectDictDataByType("PARTNERS");
         for (TTargetagreement t : list) {
             List<TTargetyardstick> tTargetyardsticks = tTargetyardstickService.selectTTargetyardstickByAgreementId(t.getId());
-            for (TTargetyardstick y : tTargetyardsticks) {
-                if (y.getPartners() != null) {
-                    String[] partners = y.getPartners().split(",");
-                    int i = 0;
-                    String partnersName = "";
-                    for (String p : partners) {
-                        for (SysDictData a : partnersDict) {
-                            if (a.getDictValue().equals(p)) {
-                                if (i != 0) {
-                                    partnersName = partnersName + "," + a.getDictLabel();
-                                }else {
-                                    partnersName = a.getDictLabel();
+            if (!t.getActualpost().equals("24")) {
+                for (TTargetyardstick y : tTargetyardsticks) {
+                    if (y.getPartners() != null) {
+                        String[] partners = y.getPartners().split(",");
+                        int i = 0;
+                        String partnersName = "";
+                        for (String p : partners) {
+                            for (SysDictData a : partnersDict) {
+                                if (a.getDictValue().equals(p)) {
+                                    if (i != 0) {
+                                        partnersName = partnersName + "," + a.getDictLabel();
+                                    }else {
+                                        partnersName = a.getDictLabel();
+                                    }
                                 }
                             }
+                            i++;
                         }
-                        i++;
+                        y.setPartners(partnersName);
                     }
-                    y.setPartners(partnersName);
                 }
             }
             t.settTargetyardsticks(tTargetyardsticks);

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

@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
-        order by d.year desc, l.item_top asc, l.item_last asc
+        order by l.year desc, l.item_top asc, l.item_last asc
     </select>
     
     <select id="selectTTargetreviewById" parameterType="Long" resultMap="TTargetreviewResult">

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

@@ -241,7 +241,7 @@
             <span v-else>{{ scope.row.target }}</span>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('完成时间')" align="center" header-align="center" prop="achieveDate">
+        <el-table-column :label="$t('完成时间')" align="center" header-align="center" prop="achieveDate" width="100" >
           <template slot-scope="scope">
             <el-date-picker
               v-if="scope.row.isEdit"
@@ -253,7 +253,7 @@
             <span v-else>{{ parseTime(scope.row.achieveDate, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('判定标准')" align="left" header-align="center" prop="yardstick">
+        <el-table-column :label="$t('判定标准')" align="left" header-align="center" prop="yardstick" width="500" >
           <template slot-scope="scope">
             <el-input v-if="scope.row.isEdit" type="textarea" :rows="4" v-model="scope.row.yardstick" :placeholder="$t('请输入')+$t('判定标准')" />
             <span v-else>{{ scope.row.yardstick }}</span>
@@ -261,15 +261,21 @@
         </el-table-column>
         <el-table-column :label="$t('合作者')" align="center" header-align="center" prop="partners">
           <template slot-scope="scope">
-            <el-select v-model="scope.row.partners" :placeholder="$t('请选择')+$t('合作者')" multiple v-if="scope.row.isEdit">
-              <el-option
-                v-for="dict in partnersOptions"
-                :key="dict.dictValue"
-                :label="dict.dictLabel"
-                :value="dict.dictValue"
-              ></el-option>
-            </el-select>
-            <span v-else>{{ scope.row.partnersName }}</span>
+            <span v-if="scope.row.isEdit">
+              <el-input v-if="rowActualpost === '24'" v-model="scope.row.partners" :placeholder="$t('请输入') + $t('合作者')" />
+              <el-select v-model="scope.row.partners" :placeholder="$t('请选择')+$t('合作者')" multiple v-else>
+                <el-option
+                  v-for="dict in partnersOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </span>
+            <span v-else>
+              <span v-if="rowActualpost === '24'">{{ scope.row.partners }}</span>
+              <span v-else>{{ scope.row.partnersName }}</span>
+            </span>
           </template>
         </el-table-column>
         <el-table-column :label="$t('权重比例')" align="center" header-align="center" prop="weighing" width="100">
@@ -421,6 +427,8 @@ export default {
       targetagreementList: [],
       // 目标完成判定标准表格数据
       targetyardstickList: [],
+      //选择查看人员判定标准的人员岗位
+      rowActualpost: "",
       // 弹出层标题
       title: "",
       yardstickTitle: "",
@@ -675,6 +683,7 @@ export default {
     },
     /** 判断标准按钮操作 */
     handleYardstick(row) {
+      this.rowActualpost = row.actualpost
       let _this = this
       this.yardstickReset();
       this.yardstickLoading = true;
@@ -694,22 +703,24 @@ export default {
           element["isAdd"] = false
         });
         this.targetyardstickList = response.rows;
-        this.targetyardstickList.forEach(function (value,key,arr) {
-          var partnersName = null;
-          let partners = null;
-          if (value.partners != null) {
-            partners = value.partners.split(",");
-            partners.forEach(function (value, key, arr) {
-              if (key != 0) {
-                partnersName = partnersName + "," + _this.selectDictLabel(_this.partnersOptions, value);
-              }else if (key == 0) {
-                partnersName = _this.selectDictLabel(_this.partnersOptions, value);
-              }
-            });
-          }
-          _this.targetyardstickList[key].partners = partners;
-          _this.targetyardstickList[key].partnersName = partnersName;
-        })
+        if (row.actualpost !== "24") {
+          this.targetyardstickList.forEach(function (value,key,arr) {
+            var partnersName = null;
+            let partners = null;
+            if (value.partners != null) {
+              partners = value.partners.split(",");
+              partners.forEach(function (value, key, arr) {
+                if (key != 0) {
+                  partnersName = partnersName + "," + _this.selectDictLabel(_this.partnersOptions, value);
+                }else if (key == 0) {
+                  partnersName = _this.selectDictLabel(_this.partnersOptions, value);
+                }
+              });
+            }
+            _this.targetyardstickList[key].partners = partners;
+            _this.targetyardstickList[key].partnersName = partnersName;
+          })
+        }
         this.yardstickLoading = false;
         this.yardstickOpen = true;
         this.yardstickTitle = employeeName + year + this.$t('年') + this.$t('判断标准');
@@ -739,15 +750,17 @@ export default {
       that.yardstickLoading = true;
       this.yardstickForm = row;
       this.yardstickForm.agreementId = this.yardstickQueryParams.agreementId;
-      var partner = null;
-      this.yardstickForm.partners.forEach(function (value,key,arr) {
-        if (key != 0) {
-          partner = partner + "," + value;
-        }else if (key == 0) {
-          partner = value;
-        }
-      })
-      this.yardstickForm.partners = partner;
+      if (this.rowActualpost !== "24") {
+        var partner = null;
+        this.yardstickForm.partners.forEach(function (value,key,arr) {
+          if (key != 0) {
+            partner = partner + "," + value;
+          }else if (key == 0) {
+            partner = value;
+          }
+        })
+        this.yardstickForm.partners = partner;
+      }
       this.form.id = row.agreementId
       if (row.isAdd == true) {
         addTargetyardstick(this.yardstickForm).then(response => {