diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java index 86e4243e..5dedc010 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java @@ -163,7 +163,8 @@ public class XmIterationController { if("branchId".equals(queryScope)){ params.put("branchId",user.getBranchId()); } - List> datas = xmIterationService.selectListMapByWhereWithState(params); //列出XmIteration列表 + QueryWrapper qw=QueryTools.initQueryWrapper(XmIteration.class,params); + List> datas = xmIterationService.selectListMapByWhereWithState(page,qw,params); //列出XmIteration列表 return Result.ok().setData(datas); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionWorkloadController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionWorkloadController.java deleted file mode 100644 index 261323a0..00000000 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionWorkloadController.java +++ /dev/null @@ -1,155 +0,0 @@ -package com.xm.core.ctrl; - -import java.util.*; -import java.util.stream.Collectors; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import io.swagger.annotations.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.mdp.core.entity.Result; -import com.mdp.core.query.QueryTools; -import static com.mdp.core.utils.BaseUtils.*; -import com.mdp.core.entity.Tips; -import com.mdp.core.entity.LangTips; -import com.mdp.core.err.BizException; -import com.mdp.core.utils.RequestUtils; -import com.mdp.core.utils.NumberUtil; -import com.mdp.safe.client.entity.User; -import com.mdp.safe.client.utils.LoginUtils; -import com.mdp.swagger.ApiEntityParams; -import io.swagger.annotations.*; -import springfox.documentation.annotations.ApiIgnore; - -import javax.servlet.http.HttpServletRequest; - -import com.xm.core.service.XmQuestionWorkloadService; -import com.xm.core.entity.XmQuestionWorkload; -/** - * @author maimeng-mdp code-gen - * @since 2023-10-3 - */ -@RestController -@RequestMapping(value="/xm/core/xmQuestionWorkload") -@Api(tags={"工时登记表-操作接口"}) -public class XmQuestionWorkloadController { - - static Logger logger =LoggerFactory.getLogger(XmQuestionWorkloadController.class); - - @Autowired - private XmQuestionWorkloadService xmQuestionWorkloadService; - - @ApiOperation( value = "工时登记表-查询列表",notes=" ") - @ApiEntityParams(XmQuestionWorkload.class) - @ApiResponses({ - @ApiResponse(code = 200,response=XmQuestionWorkload.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") - }) - @RequestMapping(value="/list",method=RequestMethod.GET) - public Result listXmQuestionWorkload(@ApiIgnore @RequestParam Map params){ - User user=LoginUtils.getCurrentUserInfo(); - QueryWrapper qw = QueryTools.initQueryWrapper(XmQuestionWorkload.class , params); - IPage page=QueryTools.initPage(params); - List> datas = xmQuestionWorkloadService.selectListMapByWhere(page,qw,params); - return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); - } - - - @ApiOperation( value = "工时登记表-新增",notes=" ") - @ApiResponses({ - @ApiResponse(code = 200,response=XmQuestionWorkload.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") - }) - @RequestMapping(value="/add",method=RequestMethod.POST) - public Result addXmQuestionWorkload(@RequestBody XmQuestionWorkload xmQuestionWorkload) { - xmQuestionWorkloadService.save(xmQuestionWorkload); - return Result.ok("add-ok","添加成功！"); - } - - @ApiOperation( value = "工时登记表-删除",notes=" ") - @ApiResponses({ - @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}") - }) - @RequestMapping(value="/del",method=RequestMethod.POST) - public Result delXmQuestionWorkload(@RequestBody XmQuestionWorkload xmQuestionWorkload){ - xmQuestionWorkloadService.removeById(xmQuestionWorkload); - return Result.ok("del-ok","删除成功！"); - } - - @ApiOperation( value = "工时登记表-修改",notes=" ") - @ApiResponses({ - @ApiResponse(code = 200,response=XmQuestionWorkload.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") - }) - @RequestMapping(value="/edit",method=RequestMethod.POST) - public Result editXmQuestionWorkload(@RequestBody XmQuestionWorkload xmQuestionWorkload) { - xmQuestionWorkloadService.updateById(xmQuestionWorkload); - return Result.ok("edit-ok","修改成功！"); - } - - @ApiOperation( value = "工时登记表-批量修改某些字段",notes="") - @ApiEntityParams( value = XmQuestionWorkload.class, props={ }, remark = "工时登记表", paramType = "body" ) - @ApiResponses({ - @ApiResponse(code = 200,response=XmQuestionWorkload.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") - }) - @RequestMapping(value="/editSomeFields",method=RequestMethod.POST) - public Result editSomeFields( @ApiIgnore @RequestBody Map params) { - User user= LoginUtils.getCurrentUserInfo(); - xmQuestionWorkloadService.editSomeFields(params); - return Result.ok("edit-ok","更新成功"); - } - - @ApiOperation( value = "工时登记表-批量删除",notes=" ") - @ApiResponses({ - @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}") - }) - @RequestMapping(value="/batchDel",method=RequestMethod.POST) - public Result batchDelXmQuestionWorkload(@RequestBody List xmQuestionWorkloads) { - User user= LoginUtils.getCurrentUserInfo(); - if(xmQuestionWorkloads.size()<=0){ - return Result.error("batchDel-data-err-0","请上送待删除数据列表"); - } - List datasDb=xmQuestionWorkloadService.listByIds(xmQuestionWorkloads.stream().map(i-> i.getId() ).collect(Collectors.toList())); - - List can=new ArrayList<>(); - List no=new ArrayList<>(); - for (XmQuestionWorkload data : datasDb) { - if(true){ - can.add(data); - }else{ - no.add(data); - } - } - List msgs=new ArrayList<>(); - if(can.size()>0){ - xmQuestionWorkloadService.removeByIds(can); - msgs.add(LangTips.transMsg("del-ok-num","成功删除%s条数据.",can.size())); - } - - if(no.size()>0){ - msgs.add(LangTips.transMsg("not-allow-del-num","以下%s条数据不能删除:【%s】",no.size(),no.stream().map(i-> i.getId() ).collect(Collectors.joining(",")))); - } - if(can.size()>0){ - return Result.ok(msgs.stream().collect(Collectors.joining())); - }else { - return Result.error(msgs.stream().collect(Collectors.joining())); - } - } - - @ApiOperation( value = "工时登记表-根据主键查询一条数据",notes=" ") - @ApiResponses({ - @ApiResponse(code = 200,response=XmQuestionWorkload.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") - }) - @RequestMapping(value="/queryById",method=RequestMethod.GET) - public Result queryById(XmQuestionWorkload xmQuestionWorkload) { - XmQuestionWorkload data = (XmQuestionWorkload) xmQuestionWorkloadService.getById(xmQuestionWorkload); - return Result.ok().setData(data); - } - -} diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java deleted file mode 100644 index 59c0d590..00000000 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java +++ /dev/null @@ -1,155 +0,0 @@ -package com.xm.core.ctrl; - -import java.util.*; -import java.util.stream.Collectors; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import io.swagger.annotations.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.mdp.core.entity.Result; -import com.mdp.core.query.QueryTools; -import static com.mdp.core.utils.BaseUtils.*; -import com.mdp.core.entity.Tips; -import com.mdp.core.entity.LangTips; -import com.mdp.core.err.BizException; -import com.mdp.core.utils.RequestUtils; -import com.mdp.core.utils.NumberUtil; -import com.mdp.safe.client.entity.User; -import com.mdp.safe.client.utils.LoginUtils; -import com.mdp.swagger.ApiEntityParams; -import io.swagger.annotations.*; -import springfox.documentation.annotations.ApiIgnore; - -import javax.servlet.http.HttpServletRequest; - -import com.xm.core.service.XmTaskWorkloadService; -import com.xm.core.entity.XmTaskWorkload; -/** - * @author maimeng-mdp code-gen - * @since 2023-10-3 - */ -@RestController -@RequestMapping(value="/xm/core/xmTaskWorkload") -@Api(tags={"工时登记表-操作接口"}) -public class XmTaskWorkloadController { - - static Logger logger =LoggerFactory.getLogger(XmTaskWorkloadController.class); - - @Autowired - private XmTaskWorkloadService xmTaskWorkloadService; - - @ApiOperation( value = "工时登记表-查询列表",notes=" ") - @ApiEntityParams(XmTaskWorkload.class) - @ApiResponses({ - @ApiResponse(code = 200,response=XmTaskWorkload.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") - }) - @RequestMapping(value="/list",method=RequestMethod.GET) - public Result listXmTaskWorkload(@ApiIgnore @RequestParam Map params){ - User user=LoginUtils.getCurrentUserInfo(); - QueryWrapper qw = QueryTools.initQueryWrapper(XmTaskWorkload.class , params); - IPage page=QueryTools.initPage(params); - List> datas = xmTaskWorkloadService.selectListMapByWhere(page,qw,params); - return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); - } - - - @ApiOperation( value = "工时登记表-新增",notes=" ") - @ApiResponses({ - @ApiResponse(code = 200,response=XmTaskWorkload.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") - }) - @RequestMapping(value="/add",method=RequestMethod.POST) - public Result addXmTaskWorkload(@RequestBody XmTaskWorkload xmTaskWorkload) { - xmTaskWorkloadService.save(xmTaskWorkload); - return Result.ok("add-ok","添加成功！"); - } - - @ApiOperation( value = "工时登记表-删除",notes=" ") - @ApiResponses({ - @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}") - }) - @RequestMapping(value="/del",method=RequestMethod.POST) - public Result delXmTaskWorkload(@RequestBody XmTaskWorkload xmTaskWorkload){ - xmTaskWorkloadService.removeById(xmTaskWorkload); - return Result.ok("del-ok","删除成功！"); - } - - @ApiOperation( value = "工时登记表-修改",notes=" ") - @ApiResponses({ - @ApiResponse(code = 200,response=XmTaskWorkload.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") - }) - @RequestMapping(value="/edit",method=RequestMethod.POST) - public Result editXmTaskWorkload(@RequestBody XmTaskWorkload xmTaskWorkload) { - xmTaskWorkloadService.updateById(xmTaskWorkload); - return Result.ok("edit-ok","修改成功！"); - } - - @ApiOperation( value = "工时登记表-批量修改某些字段",notes="") - @ApiEntityParams( value = XmTaskWorkload.class, props={ }, remark = "工时登记表", paramType = "body" ) - @ApiResponses({ - @ApiResponse(code = 200,response=XmTaskWorkload.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") - }) - @RequestMapping(value="/editSomeFields",method=RequestMethod.POST) - public Result editSomeFields( @ApiIgnore @RequestBody Map params) { - User user= LoginUtils.getCurrentUserInfo(); - xmTaskWorkloadService.editSomeFields(params); - return Result.ok("edit-ok","更新成功"); - } - - @ApiOperation( value = "工时登记表-批量删除",notes=" ") - @ApiResponses({ - @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}") - }) - @RequestMapping(value="/batchDel",method=RequestMethod.POST) - public Result batchDelXmTaskWorkload(@RequestBody List xmTaskWorkloads) { - User user= LoginUtils.getCurrentUserInfo(); - if(xmTaskWorkloads.size()<=0){ - return Result.error("batchDel-data-err-0","请上送待删除数据列表"); - } - List datasDb=xmTaskWorkloadService.listByIds(xmTaskWorkloads.stream().map(i-> i.getId() ).collect(Collectors.toList())); - - List can=new ArrayList<>(); - List no=new ArrayList<>(); - for (XmTaskWorkload data : datasDb) { - if(true){ - can.add(data); - }else{ - no.add(data); - } - } - List msgs=new ArrayList<>(); - if(can.size()>0){ - xmTaskWorkloadService.removeByIds(can); - msgs.add(LangTips.transMsg("del-ok-num","成功删除%s条数据.",can.size())); - } - - if(no.size()>0){ - msgs.add(LangTips.transMsg("not-allow-del-num","以下%s条数据不能删除:【%s】",no.size(),no.stream().map(i-> i.getId() ).collect(Collectors.joining(",")))); - } - if(can.size()>0){ - return Result.ok(msgs.stream().collect(Collectors.joining())); - }else { - return Result.error(msgs.stream().collect(Collectors.joining())); - } - } - - @ApiOperation( value = "工时登记表-根据主键查询一条数据",notes=" ") - @ApiResponses({ - @ApiResponse(code = 200,response=XmTaskWorkload.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") - }) - @RequestMapping(value="/queryById",method=RequestMethod.GET) - public Result queryById(XmTaskWorkload xmTaskWorkload) { - XmTaskWorkload data = (XmTaskWorkload) xmTaskWorkloadService.getById(xmTaskWorkload); - return Result.ok().setData(data); - } - -} diff --git a/xm-core/src/main/java/com/xm/core/entity/XmQuestionTag.java b/xm-core/src/main/java/com/xm/core/entity/XmQuestionTag.java deleted file mode 100644 index 26811e38..00000000 --- a/xm-core/src/main/java/com/xm/core/entity/XmQuestionTag.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.xm.core.entity; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -import java.util.Date; - -/** - * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
- * 实体 XmQuestionTag所有属性名:
- * questionId,tagId,tagName,ctime,id;
- * 表 XM.xm_question_tag 问题标签关联表的所有字段名:
- * question_id,tag_id,tag_name,ctime,id;
- * 当前主键(包括多主键):
- * id;
- */ -@ApiModel(description="问题标签关联表") -public class XmQuestionTag implements java.io.Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(notes="主键,主键",allowEmptyValue=true,example="",allowableValues="") - String id; - - - @ApiModelProperty(notes="问题编号",allowEmptyValue=true,example="",allowableValues="") - String questionId; - - @ApiModelProperty(notes="标签编号",allowEmptyValue=true,example="",allowableValues="") - String tagId; - - @ApiModelProperty(notes="标签名称",allowEmptyValue=true,example="",allowableValues="") - String tagName; - - @ApiModelProperty(notes="添加时间",allowEmptyValue=true,example="",allowableValues="") - Date ctime; - - /**主键**/ - public XmQuestionTag(String id) { - this.id = id; - } - - /**问题标签关联表**/ - public XmQuestionTag() { - } - - /** - * 问题编号 - **/ - public void setQuestionId(String questionId) { - this.questionId = questionId; - } - /** - * 标签编号 - **/ - public void setTagId(String tagId) { - this.tagId = tagId; - } - /** - * 标签名称 - **/ - public void setTagName(String tagName) { - this.tagName = tagName; - } - /** - * 添加时间 - **/ - public void setCtime(Date ctime) { - this.ctime = ctime; - } - /** - * 主键 - **/ - public void setId(String id) { - this.id = id; - } - - /** - * 问题编号 - **/ - public String getQuestionId() { - return this.questionId; - } - /** - * 标签编号 - **/ - public String getTagId() { - return this.tagId; - } - /** - * 标签名称 - **/ - public String getTagName() { - return this.tagName; - } - /** - * 添加时间 - **/ - public Date getCtime() { - return this.ctime; - } - /** - * 主键 - **/ - public String getId() { - return this.id; - } - -} \ No newline at end of file diff --git a/xm-core/src/main/java/com/xm/core/entity/XmQuestionWorkload.java b/xm-core/src/main/java/com/xm/core/entity/XmQuestionWorkload.java deleted file mode 100644 index c7bf375c..00000000 --- a/xm-core/src/main/java/com/xm/core/entity/XmQuestionWorkload.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.xm.core.entity; -import lombok.Data; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.mdp.core.dao.annotation.TableIds; -import com.baomidou.mybatisplus.annotation.TableName; -import org.apache.ibatis.type.Alias; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.util.Date; -import java.math.BigDecimal; - -/** - * @author code-gen - * @since 2023-10-3 - */ -@Data -@TableName("xm_question_workload") -@ApiModel(description="工时登记表") -public class XmQuestionWorkload implements java.io.Serializable { - - private static final long serialVersionUID = 1L; - @TableId(type = IdType.ASSIGN_ID) - - @ApiModelProperty(notes="主键,主键",allowEmptyValue=true,example="",allowableValues="") - Integer id; - - - @ApiModelProperty(notes="员工编号",allowEmptyValue=true,example="",allowableValues="") - String userid; - - - @ApiModelProperty(notes="姓名",allowEmptyValue=true,example="",allowableValues="") - String username; - - - @ApiModelProperty(notes="创建日期",allowEmptyValue=true,example="",allowableValues="") - Date ctime; - - - @ApiModelProperty(notes="业务对象主键任务编号",allowEmptyValue=true,example="",allowableValues="") - String bugId; - - - @ApiModelProperty(notes="创建人编号",allowEmptyValue=true,example="",allowableValues="") - String cuserid; - - - @ApiModelProperty(notes="业务日期yyyy-MM-dd",allowEmptyValue=true,example="",allowableValues="") - String bizDate; - - - @ApiModelProperty(notes="状态0-待确认，1-已确认，2-无效",allowEmptyValue=true,example="",allowableValues="") - String wstatus; - - - @ApiModelProperty(notes="备注",allowEmptyValue=true,example="",allowableValues="") - String remark; - - - @ApiModelProperty(notes="任务类型-关联字典taskType",allowEmptyValue=true,example="",allowableValues="") - String ttype; - - - @ApiModelProperty(notes="结算单据编号",allowEmptyValue=true,example="",allowableValues="") - String sbillId; - - - @ApiModelProperty(notes="结算提交时间",allowEmptyValue=true,example="",allowableValues="") - Date stime; - - - @ApiModelProperty(notes="结算状态0-无需结算，1-待结算2-已提交3-已通过4-已结算",allowEmptyValue=true,example="",allowableValues="") - String sstatus; - - - @ApiModelProperty(notes="工时对应金额",allowEmptyValue=true,example="",allowableValues="") - BigDecimal amt; - - - @ApiModelProperty(notes="结算金额",allowEmptyValue=true,example="",allowableValues="") - BigDecimal samt; - - - @ApiModelProperty(notes="工时，一个bug可多次提交，小时",allowEmptyValue=true,example="",allowableValues="") - BigDecimal workload; - - - @ApiModelProperty(notes="项目编号",allowEmptyValue=true,example="",allowableValues="") - String projectId; - - /** - *主键 - **/ - public XmQuestionWorkload(Integer id) { - this.id = id; - } - - /** - * 工时登记表 - **/ - public XmQuestionWorkload() { - } - -} \ No newline at end of file diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTaskWorkload.java b/xm-core/src/main/java/com/xm/core/entity/XmTaskWorkload.java deleted file mode 100644 index 8a1190f0..00000000 --- a/xm-core/src/main/java/com/xm/core/entity/XmTaskWorkload.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.xm.core.entity; -import lombok.Data; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.mdp.core.dao.annotation.TableIds; -import com.baomidou.mybatisplus.annotation.TableName; -import org.apache.ibatis.type.Alias; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.util.Date; -import java.math.BigDecimal; - -/** - * @author code-gen - * @since 2023-10-3 - */ -@Data -@TableName("xm_task_workload") -@ApiModel(description="工时登记表") -public class XmTaskWorkload implements java.io.Serializable { - - private static final long serialVersionUID = 1L; - @TableId(type = IdType.ASSIGN_ID) - - @ApiModelProperty(notes="主键,主键",allowEmptyValue=true,example="",allowableValues="") - String id; - - - @ApiModelProperty(notes="员工编号",allowEmptyValue=true,example="",allowableValues="") - String userid; - - - @ApiModelProperty(notes="姓名",allowEmptyValue=true,example="",allowableValues="") - String username; - - - @ApiModelProperty(notes="创建日期",allowEmptyValue=true,example="",allowableValues="") - Date ctime; - - - @ApiModelProperty(notes="任务编号，任务报工必填",allowEmptyValue=true,example="",allowableValues="") - String taskId; - - - @ApiModelProperty(notes="创建人编号",allowEmptyValue=true,example="",allowableValues="") - String cuserid; - - - @ApiModelProperty(notes="业务日期yyyy-MM-dd",allowEmptyValue=true,example="",allowableValues="") - String bizDate; - - - @ApiModelProperty(notes="状态0-待确认，1-已确认，2-无效",allowEmptyValue=true,example="",allowableValues="") - String wstatus; - - - @ApiModelProperty(notes="备注",allowEmptyValue=true,example="",allowableValues="") - String remark; - - - @ApiModelProperty(notes="任务类型-关联字典taskType",allowEmptyValue=true,example="",allowableValues="") - String ttype; - - - @ApiModelProperty(notes="结算提交时间",allowEmptyValue=true,example="",allowableValues="") - Date stime; - - - @ApiModelProperty(notes="结算状态0-无需结算，1-待结算2-已提交3-已通过4-已结算",allowEmptyValue=true,example="",allowableValues="") - String sstatus; - - - @ApiModelProperty(notes="工时，一个task_id可多次提交，小时",allowEmptyValue=true,example="",allowableValues="") - BigDecimal workload; - - - @ApiModelProperty(notes="任务剩余工时（同一天取最后日期更新到task表budget_workload中）",allowEmptyValue=true,example="",allowableValues="") - BigDecimal rworkload; - - - @ApiModelProperty(notes="创建人姓名",allowEmptyValue=true,example="",allowableValues="") - String cusername; - - - @ApiModelProperty(notes="归属项目",allowEmptyValue=true,example="",allowableValues="") - String projectId; - - - @ApiModelProperty(notes="项目归属机构",allowEmptyValue=true,example="",allowableValues="") - String branchId; - - - @ApiModelProperty(notes="用户归属机构",allowEmptyValue=true,example="",allowableValues="") - String ubranchId; - - - @ApiModelProperty(notes="结算单编号",allowEmptyValue=true,example="",allowableValues="") - String sbillId; - - - @ApiModelProperty(notes="结算单明细表id",allowEmptyValue=true,example="",allowableValues="") - String detailId; - - - @ApiModelProperty(notes="需求编号，缺陷报工、测试报工、任务报工都可以填",allowEmptyValue=true,example="",allowableValues="") - String menuId; - - - @ApiModelProperty(notes="产品编号，能关联到的都填",allowEmptyValue=true,example="",allowableValues="") - String productId; - - - @ApiModelProperty(notes="测试用例编号(如果是测试执行报工，必填)",allowEmptyValue=true,example="",allowableValues="") - String caseId; - - - @ApiModelProperty(notes="测试计划编号(如果是测试执行报工，必填)",allowEmptyValue=true,example="",allowableValues="") - String planId; - - - @ApiModelProperty(notes="缺陷编号(如果是缺陷报工，必填)",allowEmptyValue=true,example="",allowableValues="") - String bugId; - - - @ApiModelProperty(notes="报工类型1-任务，2-缺陷，3-测试用例设计，4-测试执行",allowEmptyValue=true,example="",allowableValues="") - String bizType; - - /** - *主键 - **/ - public XmTaskWorkload(String id) { - this.id = id; - } - - /** - * 工时登记表 - **/ - public XmTaskWorkload() { - } - -} \ No newline at end of file diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmIterationMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmIterationMapper.java index 671da2de..0066cc3b 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmIterationMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmIterationMapper.java @@ -25,6 +25,6 @@ public interface XmIterationMapper extends BaseMapper { void load_tasks_to_xm_iteration_state(String inIterationId); - List> selectListMapByWhereWithState(Map iterationMap); + List> selectListMapByWhereWithState(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmMenuMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmMenuMapper.java index fa9d3878..64511e66 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmMenuMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmMenuMapper.java @@ -27,11 +27,11 @@ public interface XmMenuMapper extends BaseMapper { List getUserCanOpMenusByIds(Map map); - List> selectListMapByWhereWithPlan(Map xmMenu); + List> selectListMapByWhereWithPlan(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); - List> selectListMapByWhereWithState(Map xmMenu); + List> selectListMapByWhereWithState(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); - List> selectListMapByWhereWithPhase(Map xmMenu); + List> selectListMapByWhereWithPhase(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); void updateMenuChildrenCntByMenuId(String menuId); @@ -61,11 +61,11 @@ public interface XmMenuMapper extends BaseMapper { void batchSumParents(List ids); - List> getXmMenuAttDist(Map xmMenu); + List> getXmMenuAttDist(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); - List> getXmMenuAgeDist(Map xmMenu); + List> getXmMenuAgeDist(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); - List> getXmMenuSort(Map xmMenu); + List> getXmMenuSort(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); void updateUps(List menuIds); diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmQuestionMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmQuestionMapper.java index faa96e6d..8a60149e 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmQuestionMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmQuestionMapper.java @@ -29,12 +29,12 @@ public interface XmQuestionMapper extends BaseMapper { void updateProcessApprova(Map flowVars); - List> getXmQuestionAttDist(Map xmQuestion); + List> getXmQuestionAttDist(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); - List> getXmQuestionAgeDist(Map xmQuestion); + List> getXmQuestionAgeDist(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); - List> getXmQuestionSort(Map xmQuestion); + List> getXmQuestionSort(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); - List> getXmQuestionRetestDist(Map xmQuestion); + List> getXmQuestionRetestDist(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmQuestionWorkloadMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmQuestionWorkloadMapper.java deleted file mode 100644 index d94ae36c..00000000 --- a/xm-core/src/main/java/com/xm/core/mapper/XmQuestionWorkloadMapper.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.xm.core.mapper; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Param; - -import java.util.List; -import java.util.Map; - -import com.xm.core.entity.XmQuestionWorkload; -/** - * @author maimeng-mdp code-gen - * @since 2023-10-3 - */ -public interface XmQuestionWorkloadMapper extends BaseMapper { - - /** - * 自定义查询，支持多表关联 - * @param page 分页条件 - * @param ew 一定要，并且必须加@Param("ew")注解 - * @param ext 如果xml中需要根据某些值进行特殊处理，可以通过这个进行传递，非必须，注解也可以不加 - * @return - */ - List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); - -} - diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmQuestionWorkloadMapper.xml b/xm-core/src/main/java/com/xm/core/mapper/XmQuestionWorkloadMapper.xml deleted file mode 100644 index e79a7223..00000000 --- a/xm-core/src/main/java/com/xm/core/mapper/XmQuestionWorkloadMapper.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmTaskWorkloadMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmTaskWorkloadMapper.java deleted file mode 100644 index c6b05a85..00000000 --- a/xm-core/src/main/java/com/xm/core/mapper/XmTaskWorkloadMapper.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.xm.core.mapper; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Param; - -import java.util.List; -import java.util.Map; - -import com.xm.core.entity.XmTaskWorkload; -/** - * @author maimeng-mdp code-gen - * @since 2023-10-3 - */ -public interface XmTaskWorkloadMapper extends BaseMapper { - - /** - * 自定义查询，支持多表关联 - * @param page 分页条件 - * @param ew 一定要，并且必须加@Param("ew")注解 - * @param ext 如果xml中需要根据某些值进行特殊处理，可以通过这个进行传递，非必须，注解也可以不加 - * @return - */ - List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); - -} - diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmTaskWorkloadMapper.xml b/xm-core/src/main/java/com/xm/core/mapper/XmTaskWorkloadMapper.xml deleted file mode 100644 index 9cbcbbb4..00000000 --- a/xm-core/src/main/java/com/xm/core/mapper/XmTaskWorkloadMapper.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/xm-core/src/main/java/com/xm/core/service/XmIterationService.java b/xm-core/src/main/java/com/xm/core/service/XmIterationService.java index 9253e52d..66ce300c 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmIterationService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmIterationService.java @@ -40,12 +40,10 @@ public class XmIterationService extends BaseService> selectListMapByWhereWithState(Map iterationMap) { - // TODO Auto-generated method stub - return baseMapper.selectListMapByWhereWithState( iterationMap); + public List> selectListMapByWhereWithState(IPage page, QueryWrapper qw, Map params) { + return baseMapper.selectListMapByWhereWithState( page,qw,params ); } @Transactional diff --git a/xm-core/src/main/java/com/xm/core/service/XmIterationStateService.java b/xm-core/src/main/java/com/xm/core/service/XmIterationStateService.java index 04995d28..c7d32fbb 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmIterationStateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmIterationStateService.java @@ -31,7 +31,7 @@ public class XmIterationStateService extends BaseService { /** * 连同功能关联的项目需求计划数据一起带出 * - * @param xmMenu + * @param params * @return */ - public List> selectListMapByWhereWithPlan(Map xmMenu) { - return baseMapper.selectListMapByWhereWithPlan( xmMenu); + public List> selectListMapByWhereWithPlan(Map params) { + return baseMapper.selectListMapByWhereWithPlan(QueryTools.initPage(params),QueryTools.initQueryWrapper(XmMenu.class,params),params); } /** * 连同功能关联的状态数据一起带出 * - * @param xmMenu + * @param params * @return */ - public List> selectListMapByWhereWithState(Map xmMenu) { + public List> selectListMapByWhereWithState(Map params) { - return baseMapper.selectListMapByWhereWithState( xmMenu); + return baseMapper.selectListMapByWhereWithState(QueryTools.initPage(params),QueryTools.initQueryWrapper(XmMenu.class,params),params); } /** * 连同功能关联的产品计划一并带出 * - * @param xmMenu + * @param params * @return */ - public List> selectListMapByWhereWithPhase(Map xmMenu) { + public List> selectListMapByWhereWithPhase(Map params) { - return baseMapper.selectListMapByWhereWithPhase( xmMenu); + return baseMapper.selectListMapByWhereWithPhase( QueryTools.initPage(params),QueryTools.initQueryWrapper(XmMenu.class,params),params); } @@ -402,16 +403,16 @@ public class XmMenuService extends BaseService { } - public List> getXmMenuAttDist(Map xmMenu) { - return baseMapper.getXmMenuAttDist(xmMenu); + public List> getXmMenuAttDist(Map params) { + return baseMapper.getXmMenuAttDist(QueryTools.initPage(params),QueryTools.initQueryWrapper(XmMenu.class,params),params); } - public List> getXmMenuAgeDist(Map xmMenu) { - return baseMapper.getXmMenuAgeDist(xmMenu); + public List> getXmMenuAgeDist(Map params) { + return baseMapper.getXmMenuAgeDist(QueryTools.initPage(params),QueryTools.initQueryWrapper(XmMenu.class,params),params); } - public List> getXmMenuSort(Map xmMenu) { - return baseMapper.getXmMenuSort(xmMenu); + public List> getXmMenuSort(Map params) { + return baseMapper.getXmMenuSort(QueryTools.initPage(params),QueryTools.initQueryWrapper(XmMenu.class,params),params); } @Override diff --git a/xm-core/src/main/java/com/xm/core/service/XmProductService.java b/xm-core/src/main/java/com/xm/core/service/XmProductService.java index 15ea446c..147f3e08 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProductService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProductService.java @@ -40,13 +40,6 @@ public class XmProductService extends BaseService { @Autowired XmProductCacheService xmProductCacheService; - - @Autowired - XmGroupService groupService; - - @Autowired - XmGroupUserService groupUserService; - @Autowired XmProductProjectLinkService linkService; diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectService.java index 8b05693f..08343fab 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectService.java @@ -58,12 +58,6 @@ public class XmProjectService extends BaseService { @Autowired XmProjectCacheService xmProjectCacheService; - @Autowired - XmGroupService groupService; - - @Autowired - XmGroupUserService groupUserService; - @Autowired XmProductService xmProductService; /** diff --git a/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java b/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java index ccb70e4f..c3dfba51 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java @@ -9,6 +9,7 @@ import com.mdp.core.service.BaseService; import com.mdp.core.utils.BaseUtils; import com.mdp.safe.client.entity.User; import com.mdp.safe.client.utils.LoginUtils; +import com.xm.core.entity.XmMenu; import com.xm.core.entity.XmQuestion; import com.xm.core.entity.XmQuestionHandle; import com.xm.core.mapper.XmQuestionMapper; @@ -202,16 +203,16 @@ public class XmQuestionService extends BaseService } - public List> getXmQuestionAttDist(Map xmQuestion) { - return baseMapper.getXmQuestionAttDist(xmQuestion); + public List> getXmQuestionAttDist(Map params) { + return baseMapper.getXmQuestionAttDist(QueryTools.initPage(params),QueryTools.initQueryWrapper(XmMenu.class,params),params); } - public List> getXmQuestionAgeDist(Map xmQuestion) { - return baseMapper.getXmQuestionAgeDist(xmQuestion); + public List> getXmQuestionAgeDist(Map params) { + return baseMapper.getXmQuestionAgeDist(QueryTools.initPage(params),QueryTools.initQueryWrapper(XmMenu.class,params),params); } - public List> getXmQuestionSort(Map xmQuestion) { - return baseMapper.getXmQuestionSort(xmQuestion); + public List> getXmQuestionSort(Map params) { + return baseMapper.getXmQuestionSort(QueryTools.initPage(params),QueryTools.initQueryWrapper(XmMenu.class,params),params); } @Override @@ -219,8 +220,8 @@ public class XmQuestionService extends BaseService return "Q"+getSequenceService().getCommonNo("{date62:yyyyMMddHHmmss}{rands:4}"); } - public List> getXmQuestionRetestDist(Map xmQuestion) { - return baseMapper.getXmQuestionRetestDist(xmQuestion); + public List> getXmQuestionRetestDist(Map params) { + return baseMapper.getXmQuestionRetestDist(QueryTools.initPage(params),QueryTools.initQueryWrapper(XmMenu.class,params),params); } } diff --git a/xm-core/src/main/java/com/xm/core/service/XmQuestionWorkloadService.java b/xm-core/src/main/java/com/xm/core/service/XmQuestionWorkloadService.java deleted file mode 100644 index b6fd6979..00000000 --- a/xm-core/src/main/java/com/xm/core/service/XmQuestionWorkloadService.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.xm.core.service; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import java.util.List; -import java.util.Map; -import org.springframework.stereotype.Service; -import com.mdp.core.service.BaseService; -import static com.mdp.core.utils.BaseUtils.*; -import com.mdp.core.entity.Tips; -import com.mdp.core.err.BizException; - -import com.xm.core.entity.XmQuestionWorkload; -import com.xm.core.mapper.XmQuestionWorkloadMapper; -/** - * @author maimeng-mdp code-gen - * @since 2023-10-3 - */ -@Service -public class XmQuestionWorkloadService extends BaseService { - static Logger logger =LoggerFactory.getLogger(XmQuestionWorkloadService.class); - - /** - * 自定义查询，支持多表关联 - * @param page 分页条件 - * @param ew 一定要，并且必须加@Param("ew")注解 - * @param ext 如果xml中需要根据某些值进行特殊处理，可以通过这个进行传递，非必须，注解也可以不加 - * @return - */ - public List> selectListMapByWhere(IPage page, QueryWrapper ew, Map ext){ - return baseMapper.selectListMapByWhere(page,ew,ext); - } -} - diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskWorkloadService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskWorkloadService.java index 9f823012..d6d8437c 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskWorkloadService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskWorkloadService.java @@ -8,12 +8,7 @@ import java.util.List; import java.util.Map; import org.springframework.stereotype.Service; import com.mdp.core.service.BaseService; -import static com.mdp.core.utils.BaseUtils.*; -import com.mdp.core.entity.Tips; -import com.mdp.core.err.BizException; -import com.xm.core.entity.XmTaskWorkload; -import com.xm.core.mapper.XmTaskWorkloadMapper; /** * @author maimeng-mdp code-gen * @since 2023-10-3 diff --git a/xm-core/src/test/java/com/xm/core/service/TestXmQuestionWorkloadService.java b/xm-core/src/test/java/com/xm/core/service/TestXmQuestionWorkloadService.java index aba9f8b0..ca4d593c 100644 --- a/xm-core/src/test/java/com/xm/core/service/TestXmQuestionWorkloadService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmQuestionWorkloadService.java @@ -1,17 +1,12 @@ package com.xm.core.service; import java.util.*; -import java.text.SimpleDateFormat; -import org.junit.Assert; + import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import com.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.xm.core.service.XmQuestionWorkloadService; -import com.xm.core.entity.XmQuestionWorkload; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; /** * @author code-gen diff --git a/xm-core/src/test/java/com/xm/core/service/TestXmTaskWorkloadService.java b/xm-core/src/test/java/com/xm/core/service/TestXmTaskWorkloadService.java index d9fcb550..b794a8fd 100644 --- a/xm-core/src/test/java/com/xm/core/service/TestXmTaskWorkloadService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmTaskWorkloadService.java @@ -1,17 +1,12 @@ package com.xm.core.service; import java.util.*; -import java.text.SimpleDateFormat; -import org.junit.Assert; + import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import com.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.xm.core.service.XmTaskWorkloadService; -import com.xm.core.entity.XmTaskWorkload; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; /** * @author code-gen