From f64abed5d5a3e59bb4e6f848a61a31cdbf6815f4 Mon Sep 17 00:00:00 2001
From: admin <1628672303@qq.com>
Date: Sun, 14 May 2023 09:57:43 +0800
Subject: [PATCH] 5-14

---
 .../src/views/edu/img/pic.png                 | Bin 0 -> 2046 bytes
 .../src/views/skillPoints/SkillPointsList.vue |   2 +-
 .../skillPoints/modules/SkillPointsForm.vue   |  10 +-
 .../src/views/skillType/SkillTypeList.vue     |   2 +-
 .../src/views/taskSkill/TaskSkillList.vue     |   2 +-
 .../views/taskSkill/modules/TaskSkillForm.vue |  98 +++++++++++++++---
 .../controller/SkillPointsController.java     |  11 +-
 .../skillPoints/entity/SkillPoints.java       |   2 +-
 .../controller/TaskSkillController.java       |  36 +++++++
 9 files changed, 141 insertions(+), 22 deletions(-)
 create mode 100644 ant-design-vue-jeecg/src/views/edu/img/pic.png

diff --git a/ant-design-vue-jeecg/src/views/edu/img/pic.png b/ant-design-vue-jeecg/src/views/edu/img/pic.png
new file mode 100644
index 0000000000000000000000000000000000000000..3494661c67334bf8f22ead38e934693f63fedb3e
GIT binary patch
literal 2046
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
RX5%OU0BR!5h}jcDe*vJ**^~eP

literal 0
HcmV?d00001

diff --git a/ant-design-vue-jeecg/src/views/skillPoints/SkillPointsList.vue b/ant-design-vue-jeecg/src/views/skillPoints/SkillPointsList.vue
index c755ae2..85c1494 100644
--- a/ant-design-vue-jeecg/src/views/skillPoints/SkillPointsList.vue
+++ b/ant-design-vue-jeecg/src/views/skillPoints/SkillPointsList.vue
@@ -62,7 +62,7 @@
           <div v-html="text"></div>
         </template>
         <template slot="imgSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-if="!text" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;" src="@/views/edu/img/pic.png"/>
           <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
         </template>
         <template slot="fileSlot" slot-scope="text">
diff --git a/ant-design-vue-jeecg/src/views/skillPoints/modules/SkillPointsForm.vue b/ant-design-vue-jeecg/src/views/skillPoints/modules/SkillPointsForm.vue
index 074bf6e..1145d6c 100644
--- a/ant-design-vue-jeecg/src/views/skillPoints/modules/SkillPointsForm.vue
+++ b/ant-design-vue-jeecg/src/views/skillPoints/modules/SkillPointsForm.vue
@@ -4,8 +4,8 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="supertypeId">
-              <j-search-select-tag v-model="model.supertypeId" dict="skill_type,type_name,id" placeholder="请选择类型"  ></j-search-select-tag>
+            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="skillType">
+              <j-search-select-tag v-model="model.skillType" dict="skill_type,type_name,id" placeholder="请选择类型"  ></j-search-select-tag>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -77,6 +77,12 @@
         },
         confirmLoading: false,
         validatorRules: {
+          skillType: [
+            { required: true, message: '请选择类型!'},
+          ],
+          skillName: [
+            { required: true, message: '输入技能名称!'},
+          ],
         },
         url: {
           add: "/skillPoints/skillPoints/add",
diff --git a/ant-design-vue-jeecg/src/views/skillType/SkillTypeList.vue b/ant-design-vue-jeecg/src/views/skillType/SkillTypeList.vue
index d54b075..91022c1 100644
--- a/ant-design-vue-jeecg/src/views/skillType/SkillTypeList.vue
+++ b/ant-design-vue-jeecg/src/views/skillType/SkillTypeList.vue
@@ -62,7 +62,7 @@
           <div v-html="text"></div>
         </template>
         <template slot="imgSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-if="!text" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;" src="@/views/edu/img/pic.png"/>
           <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
         </template>
         <template slot="fileSlot" slot-scope="text">
diff --git a/ant-design-vue-jeecg/src/views/taskSkill/TaskSkillList.vue b/ant-design-vue-jeecg/src/views/taskSkill/TaskSkillList.vue
index b67a1ac..13f9685 100644
--- a/ant-design-vue-jeecg/src/views/taskSkill/TaskSkillList.vue
+++ b/ant-design-vue-jeecg/src/views/taskSkill/TaskSkillList.vue
@@ -130,7 +130,7 @@
           {
             title:'任务',
             align:"center",
-            dataIndex: 'taskId_dictText'
+            dataIndex: 'taskId'
           },
           {
             title: '操作',
diff --git a/ant-design-vue-jeecg/src/views/taskSkill/modules/TaskSkillForm.vue b/ant-design-vue-jeecg/src/views/taskSkill/modules/TaskSkillForm.vue
index 83ef214..c18f71b 100644
--- a/ant-design-vue-jeecg/src/views/taskSkill/modules/TaskSkillForm.vue
+++ b/ant-design-vue-jeecg/src/views/taskSkill/modules/TaskSkillForm.vue
@@ -10,7 +10,22 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="任务类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="taskType">
-              <j-dict-select-tag v-model="model.taskType" dictCode="task_type" @change="settask" placeholder="请选择任务类型" style="width: 100%" />
+              <j-dict-select-tag v-model="model.taskType" dictCode="task_type" placeholder="请选择任务类型" @change="leixing" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item v-if="xiangmu" label="项目" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="" >
+              <j-dict-select-tag v-model="project" dictCode="projectx,project_name,id" @change="setmoduledict()" placeholder="请选择项目" ></j-dict-select-tag>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item v-if="mokuai" label="模块" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="">
+              <j-dict-select-tag v-model="module" :dictCode="moduledict" placeholder="请选择模块" @change="setfunctiondict" ></j-dict-select-tag>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item v-if="gongneng" label="功能" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="">
+              <j-dict-select-tag v-model="functionx" :dictCode="functiondict" placeholder="请选择功能" @change="settaskdict" ></j-dict-select-tag>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -44,6 +59,14 @@
     },
     data () {
       return {
+        xiangmu:false,
+        mokuai:false,
+        gongneng:false,
+        project:'',
+        module:'',
+        functionx:'',
+        moduledict:"a,a,a",
+        functiondict:"a,a,a",
         taskdict:"a,a,a",
         model:{
           taskId:'',
@@ -85,17 +108,68 @@
       this.modelDefault = JSON.parse(JSON.stringify(this.model));
     },
     methods: {
-      settask() {
-        if(this.model.taskType == '0'){
-        this.taskdict="projectx,project_name,id"
-      }else if(this.model.taskType == '1'){
-          this.taskdict="modulex,module_name,id"
-        }else if(this.model.taskType == '2'){
-          this.taskdict="functionx,function_name,id"
-        }else if(this.model.taskType == '3'){
-          this.taskdict="rulex,rule_code,id"
-        }else { this.taskdict=""}
-        this.model.taskId='';
+      leixing(){
+        // 项目0 模块1 功能2 规则3
+        // 如果显示类型选择的是项目，则不需要一步一步选择。如果类型选择的是模块，则需要先选择项目，再选择，所以要让模块显示出来，同样功能，规则也如此。。。。。。
+        if (this.model.taskType == '0'){
+          // 重置项目，模块，功能
+          this.xiangmu = false;
+          this.mokuai = false;
+          this.gongneng = false;
+          this.taskdict = "projectx,project_name,id"
+        }if (this.model.taskType == '1'){
+          // 重置模块，功能
+          this.mokuai = false;
+          this.gongneng = false;
+          // 重置任务字典
+          this.taskdict='a,a,a';
+
+          this.xiangmu = true;
+        }if (this.model.taskType == '2'){
+          // 重置功能
+          this.gongneng = false;
+          // 重置任务字典
+          this.taskdict='a,a,a';
+
+          this.xiangmu = true;
+          this.mokuai = true;
+        }if (this.model.taskType == '3'){
+          // 重置任务字典
+          this.taskdict='a,a,a';
+
+          this.xiangmu = true;
+          this.mokuai = true;
+          this.gongneng = true;
+        }
+        // 把后续下拉框内容放空
+        this.project = '';
+        this.module = '';
+        this.functionx = '';
+        this.model.taskId = '';
+      },
+      popupCallback(value,row){
+        this.model = Object.assign(this.model, row);
+      },
+      setmoduledict(){
+        this.moduledict = "modulex,module_name,id,project_id="+this.project
+        if (this.model.taskType == '1'){
+          this.taskdict = "modulex,module_name,id,project_id="+this.project
+        }
+        this.module = '';
+        this.functionx = '';
+        this.model.taskId = '';
+      },
+      setfunctiondict(){
+        this.functiondict = "functionx,function_name,id,module_id="+this.module
+        if (this.model.taskType == '2'){
+          this.taskdict = "functionx,function_name,id,module_id="+this.module
+        }
+        this.functionx = '';
+        this.model.taskId = '';
+      },
+      settaskdict(){
+        this.taskdict = "rulex,rule_code,id,function_id="+this.functionx;
+        this.model.taskId = '';
       },
       add () {
         this.edit(this.modelDefault);
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillPoints/controller/SkillPointsController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillPoints/controller/SkillPointsController.java
index f9eb799..9ec8c9d 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillPoints/controller/SkillPointsController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillPoints/controller/SkillPointsController.java
@@ -83,13 +83,16 @@ public class SkillPointsController extends JeecgController<SkillPoints, ISkillPo
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody SkillPoints skillPoints) {
 		String code = "";
-		SkillPoints skillPoints1 = skillPointsService.getOne(new QueryWrapper<SkillPoints>().lambda().orderByDesc(SkillPoints::getSkillCode));
+		List<SkillPoints> list = skillPointsService.list(new QueryWrapper<SkillPoints>().lambda().orderByDesc(SkillPoints::getSkillCode));
+		SkillPoints skillPoints1 = list.get(0);
 		if (skillPoints1 == null){
-			code = "J0000000001";
+			code = "J000000001";
 		}else {
-			code = skillPoints1.getSkillCode()+1;
+			Integer s = Integer.valueOf(skillPoints1.getSkillCode().substring(1)) + 1;
+			String format = String.format("%0" + 9 + "d", s);
+			code = "J"+format;
 		}
-		System.out.println(code);
+		skillPoints.setSkillCode(code);
 		skillPointsService.save(skillPoints);
 		return Result.OK("添加成功！");
 	}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillPoints/entity/SkillPoints.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillPoints/entity/SkillPoints.java
index a30e489..6d2650e 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillPoints/entity/SkillPoints.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillPoints/entity/SkillPoints.java
@@ -43,7 +43,7 @@ public class SkillPoints implements Serializable {
 	@Excel(name = "类型", width = 15)
     @ApiModelProperty(value = "类型")
     @Dict(dictTable = "skill_type",dicText = "type_name",dicCode = "id")
-    private java.lang.Integer skillType;
+    private java.lang.String skillType;
 	/**技能点名称*/
 	@Excel(name = "技能点名称", width = 15)
     @ApiModelProperty(value = "技能点名称")
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskSkill/controller/TaskSkillController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskSkill/controller/TaskSkillController.java
index 3bd5f01..4a88ea0 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskSkill/controller/TaskSkillController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskSkill/controller/TaskSkillController.java
@@ -12,6 +12,14 @@ import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.demo.functionx.entity.Functionx;
+import org.jeecg.modules.demo.functionx.service.IFunctionxService;
+import org.jeecg.modules.demo.rulex.entity.Rulex;
+import org.jeecg.modules.demo.rulex.service.IRulexService;
+import org.jeecg.modules.modulex.entity.Modulex;
+import org.jeecg.modules.modulex.service.IModulexService;
+import org.jeecg.modules.projectx.entity.Projectx;
+import org.jeecg.modules.projectx.service.IProjectxService;
 import org.jeecg.modules.taskSkill.entity.TaskSkill;
 import org.jeecg.modules.taskSkill.service.ITaskSkillService;
 
@@ -49,6 +57,15 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class TaskSkillController extends JeecgController<TaskSkill, ITaskSkillService> {
 	@Autowired
 	private ITaskSkillService taskSkillService;
+	@Autowired
+	private IProjectxService projectxService;
+	@Autowired
+	private IModulexService modulexService;
+	@Autowired
+	private IFunctionxService functionxService;
+	@Autowired
+	private IRulexService rulexService;
+
 	
 	/**
 	 * 分页列表查询
@@ -69,6 +86,25 @@ public class TaskSkillController extends JeecgController<TaskSkill, ITaskSkillSe
 		QueryWrapper<TaskSkill> queryWrapper = QueryGenerator.initQueryWrapper(taskSkill, req.getParameterMap());
 		Page<TaskSkill> page = new Page<TaskSkill>(pageNo, pageSize);
 		IPage<TaskSkill> pageList = taskSkillService.page(page, queryWrapper);
+		for (TaskSkill taskSkill1 : pageList.getRecords()){
+			// 任务类型 项目0 模块1 功能2 规则3
+			if (taskSkill1.getTaskType() == 0){
+				Projectx projectx = projectxService.getById(taskSkill1.getTaskId());
+				taskSkill1.setTaskId(projectx.getProjectName());
+			}
+			if (taskSkill1.getTaskType() == 1){
+				Modulex modulex = modulexService.getById(taskSkill1.getTaskId());
+				taskSkill1.setTaskId(modulex.getModuleName());
+			}
+			if (taskSkill1.getTaskType() == 2){
+				Functionx functionx = functionxService.getById(taskSkill1.getTaskId());
+				taskSkill1.setTaskId(functionx.getFunctionName());
+			}
+			if (taskSkill1.getTaskType() == 3){
+				Rulex rulex = rulexService.getById(taskSkill1.getTaskId());
+				taskSkill1.setTaskId(rulex.getRuleCode());
+			}
+		}
 		return Result.OK(pageList);
 	}