From d574c091c3cab5eb08a125c75e604376568a0645 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sat, 3 Dec 2022 16:10:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=9A=84=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xm/core/ctrl/XmTaskSkillController.java | 23 +++------ .../xm/core/service/XmTaskSkillService.java | 51 ++++--------------- 2 files changed, 16 insertions(+), 58 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSkillController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSkillController.java index 6c3d50ff..399d5001 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSkillController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSkillController.java @@ -2,12 +2,15 @@ package com.xm.core.ctrl; import com.mdp.core.entity.Tips; import com.mdp.core.err.BizException; -import com.mdp.core.utils.RequestUtils; import com.mdp.mybatis.PageUtils; import com.mdp.qx.HasQx; +import com.mdp.swagger.ApiEntityParams; import com.xm.core.entity.XmTaskSkill; import com.xm.core.service.XmTaskSkillService; -import io.swagger.annotations.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -43,25 +46,13 @@ public class XmTaskSkillController { @ApiOperation( value = "查询xm_task_skill信息列表",notes="listXmTaskSkill,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}") - @ApiImplicitParams({ - @ApiImplicitParam(name="id",value="主键,主键",required=false), - @ApiImplicitParam(name="taskId",value="任务编号",required=false), - @ApiImplicitParam(name="taskSkillId",value="技能要求",required=false), - @ApiImplicitParam(name="taskSkillName",value="技能名称",required=false), - @ApiImplicitParam(name="skillRemarks",value="技能描述",required=false), - @ApiImplicitParam(name="pageSize",value="每页记录数",required=false), - @ApiImplicitParam(name="pageNum",value="当前页码,从1开始",required=false), - @ApiImplicitParam(name="total",value="总记录数,服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算",required=false), - @ApiImplicitParam(name="orderBy",value="排序列 如性别、学生编号排序 orderBy = sex desc,student_id desc",required=false), - @ApiImplicitParam(name="count",value="是否进行总条数计算,count=true|false",required=false) - }) + @ApiEntityParams(XmTaskSkill.class) @ApiResponses({ @ApiResponse(code = 200,response= XmTaskSkill.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmTaskSkill( @ApiIgnore @RequestParam Map xmTaskSkill){ - Map m = new HashMap<>(); - RequestUtils.transformArray(xmTaskSkill, "ids"); + Map m = new HashMap<>(); PageUtils.startPage(xmTaskSkill); List> xmTaskSkillList = xmTaskSkillService.selectListMapByWhere(xmTaskSkill); //列出XmTaskSkill列表 PageUtils.responePage(m, xmTaskSkillList); diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskSkillService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskSkillService.java index 72c610e6..0a870d3d 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskSkillService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskSkillService.java @@ -4,11 +4,9 @@ import com.mdp.core.service.BaseService; import com.xm.core.entity.XmTaskSkill; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
@@ -23,50 +21,19 @@ public class XmTaskSkillService extends BaseService { /** 请在此类添加自定义函数 */ public void addSkill(List skillList) { - skillList.forEach(skill->{ - skill.setId(this.createKey("id")); - this.insert(skill); - }); + super.batchInsert(skillList); } public void insertOrDelete(List skillList){ if(skillList.size() > 0){ - String taskId = skillList.get(0).getTaskId(); - XmTaskSkill query = new XmTaskSkill(); - query.setTaskId(taskId); - List oldList = this.selectListByWhere(query); - - Map delMap = new HashMap<>(); - - - oldList.forEach(old->{ - delMap.put(old.getTaskSkillId(),old); - }); - List taskSkillIds=new ArrayList<>(); - List taskSkillNames=new ArrayList<>(); - skillList.forEach(skill -> { - if(delMap.containsKey(skill.getTaskSkillId())){ - delMap.remove(skill.getTaskSkillId()); - } - else{ - skill.setId(this.createKey("id")); - skill.setTaskId(taskId); - this.insert(skill); - } - - taskSkillIds.add(skill.getTaskSkillId()); - taskSkillNames.add(skill.getTaskSkillName()); - - - }); - - if(delMap.size() > 0){ - for(XmTaskSkill value : delMap.values()){ - this.deleteByPk(value); - } + String taskId=skillList.get(0).getTaskId(); + if(StringUtils.hasText(taskId)){ + XmTaskSkill xmTaskSkill=new XmTaskSkill(); + xmTaskSkill.setTaskId(taskId); + super.deleteByWhere(xmTaskSkill); + super.batchInsert(skillList); + this.updateXmTaskSkillIdsAndNamesByTaskId(taskId); } - - this.updateXmTaskSkillIdsAndNamesByTaskId(taskId); } }