LY 目标协议-判定标准修改

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

@@ -628,7 +628,9 @@ public class TStaffmgrController extends BaseController
                 TStaffmgr entity = new TStaffmgr();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
-                    cell.setCellType(CellType.STRING);
+                    if (cell == null) {
+                        continue;
+                    }
                     String cellValue = ExcelUtils.getCellValue(cell);
                     logger.info("cellValue:" + cellValue);
                     if (j == 0) {
@@ -732,6 +734,41 @@ public class TStaffmgrController extends BaseController
                     tWorklicense.setDeptId(t.getDeptId());
                     tWorklicenseService.insertTWorklicense(tWorklicense);
                 }
+                if (t.getUnit().equals("10")) {
+                    SimpleDateFormat sdfYear = new SimpleDateFormat("yyyy");
+                    TTrainingRegular regular = new TTrainingRegular();
+                    regular.setYear(sdfYear.format(new Date()));
+                    List<TTrainingRegular> tTrainingRegulars = tTrainingRegularService.selectTTrainingRegularList(regular);
+                    for (TTrainingRegular r : tTrainingRegulars) {
+                        if (r.getNotPlan().equals("true")) {
+                            String[] posts = r.getActualpostId().split(",");
+                            for (String post : posts) {
+                                if (post.equals(t.getActualpost())) {
+                                    TTraining training = tTrainingService.selectTTrainingByRegularId(r.getId());
+                                    if (training.getStartDate() == null) {
+                                        TTrainingDevice tTrainingDevice = new TTrainingDevice();
+                                        tTrainingDevice.setStaffId(t.getStaffid());
+                                        tTrainingDevice.setRegularId(training.getId());
+                                        tTrainingDevice.setStartDate(r.getPlanTrainingdate());
+                                        tTrainingDevice.setSupplementary("0");
+                                        tTrainingDeviceService.insertTTrainingDevice(tTrainingDevice);
+                                    } else {
+                                        TTrainingDevice tTrainingDevice = new TTrainingDevice();
+                                        tTrainingDevice.setStaffId(t.getStaffid());
+                                        tTrainingDevice.setRegularId(training.getId());
+                                        tTrainingDevice.setSupplementary("2");
+                                        tTrainingDeviceService.insertTTrainingDevice(tTrainingDevice);
+                                    }
+                                    TTrainingNon tTrainingNon = new TTrainingNon();
+                                    tTrainingNon.setStaffId(t.getStaffid());
+                                    tTrainingNon.setTrainingId(training.getId());
+                                    tTrainingNon.setIsNew("1");
+                                    tTrainingNonService.insertTTrainingNon(tTrainingNon);
+                                }
+                            }
+                        }
+                    }
+                }
                 successNumber++;
             }catch (Exception e){
                 failNumber++;

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

@@ -65,7 +65,7 @@
     </select>
 
     <select id="selectAllContent" parameterType="TTargetlist" resultMap="TTargetlistResult">
-        select  d.description from t_targetlist d
+        <include refid="selectTTargetlistVo"/>
         <where>
             <if test="year != null "> and year = #{year}</if>
             and d.parent_id != 0
@@ -79,7 +79,7 @@
     <select id="selectAllMeasures" parameterType="TTargetlist" resultMap="TTargetlistResult">
         select  m.measures, m.responsible, m.expected_date,d.description from t_targetlist d  left join t_targetmeasures m on m.targetlist_id = d.id and m.del_flag = 0
         <where>
-            and description =#{description}
+            and instr(#{description} ,description) >0
             and d.parent_id != 0
             and d.del_flag = 0
         </where>

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

@@ -243,21 +243,30 @@
       <el-table v-loading="yardstickLoading" :data="targetyardstickList" border>
         <el-table-column :label="$t('目标')" align="center" header-align="center" prop="target">
           <template slot-scope="scope">
-              <el-select
-                v-if="scope.row.isEdit"
-                v-model="scope.row.target"
-                placeholder="请输入或选择"
-                clearable
-                filterable
-                allow-create
-              >
-                <el-option
-                  v-for="item in contentList"
-                  :key="item.description"
-                  :label="item.description"
-                  :value="item.description">
-                </el-option>
-              </el-select>
+<!--              <el-select-->
+<!--                v-if="scope.row.isEdit"-->
+<!--                v-model="scope.row.target"-->
+<!--                placeholder="请输入或选择"-->
+<!--                clearable-->
+<!--                filterable-->
+<!--                allow-create-->
+<!--              >-->
+<!--                <el-option-->
+<!--                  v-for="item in contentList"-->
+<!--                  :key="item.description"-->
+<!--                  :label="item.description"-->
+<!--                  :value="item.description">-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+            <el-autocomplete
+              style="width:100%"
+              v-if="scope.row.isEdit"
+              class="inline-input"
+              v-model="scope.row.target"
+              :fetch-suggestions="querySearch"
+              placeholder="请输入目标"
+              @select="handleSelect"
+            ></el-autocomplete>
             <span v-else>{{ scope.row.target }}</span>
           </template>
         </el-table-column>
@@ -604,7 +613,12 @@ export default {
     selectFocus(year){
       this.queryParams.year=year;
       getAllContent(this.queryParams).then(response => {
+        console.log(response)
         this.contentList = response.data;
+        for (let i = 0; i <this.contentList.length ; i++) {
+          this.contentList[i].value =  this.contentList[i].description +  this.contentList[i].targets
+        }
+        console.log(this.contentList)
       });
     },
     selectChange(content){
@@ -812,6 +826,20 @@ export default {
       });
       this.partners = ''
     },
+    querySearch(queryString, cb) {
+      var contentList = this.contentList;
+      var results = queryString ? contentList.filter(this.createFilter(queryString)) : contentList;
+      // 调用 callback 返回建议列表的数据
+      cb(results);
+    },
+    createFilter(queryString) {
+      return (target) => {
+        return (target.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+      };
+    },
+    handleSelect(item) {
+      // this.selectChange(item.description)
+    },
     /** 保存判断标准按钮操作 */
     saveYardstick(row) {
       row.isEdit = false;