diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java index 5118e1f7..e18eeead 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java @@ -247,13 +247,36 @@ public class XmTaskController { } if(xmTaskMap.containsKey("executorUserid")){ if(ids.size()>1){ - return ResponseHelper.failed("ids-2","不能批量设置执行人，一次只能设置一个任务的执行人。"); + List errs=new ArrayList<>(); + List oks=new ArrayList<>(); + for (String id : ids) { + XmTaskExecuser xmTaskExecuser=new XmTaskExecuser(); + xmTaskExecuser.setTaskId(id); + xmTaskExecuser.setUserid((String)xmTaskMap.get("executorUserid")); + xmTaskExecuser.setUsername((String)xmTaskMap.get("executorUsername")); + Map result=execuserController.addXmTaskExecuser(xmTaskExecuser); + Tips tips3= (Tips) result.get("tips"); + tips3.put("taskId",id); + if(!tips3.isOk()){ + errs.add(tips3); + }else{ + oks.add(tips3); + } + String msg=""; + if(oks.size()>0){ + msg="成功设置"+oks.size()+"个任务的执行人。"; + } + if(errs.size()>0){ + msg=msg+"以下"+errs.size()+"个任务更新不成功："+errs.stream().map(i->"["+i.get("taskId")+"]"+i.getMsg()).collect(Collectors.joining(";")); + } + } + }else if(ids.size()==1){ + XmTaskExecuser xmTaskExecuser=new XmTaskExecuser(); + xmTaskExecuser.setTaskId(ids.get(0)); + xmTaskExecuser.setUserid((String)xmTaskMap.get("executorUserid")); + xmTaskExecuser.setUsername((String)xmTaskMap.get("executorUsername")); + return execuserController.addXmTaskExecuser(xmTaskExecuser); } - XmTaskExecuser xmTaskExecuser=new XmTaskExecuser(); - xmTaskExecuser.setTaskId(ids.get(0)); - xmTaskExecuser.setUserid((String)xmTaskMap.get("executorUserid")); - xmTaskExecuser.setUsername((String)xmTaskMap.get("executorUsername")); - return execuserController.addXmTaskExecuser(xmTaskExecuser); } Set fields=new HashSet<>(); fields.add("childrenCnt"); diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProject.java b/xm-core/src/main/java/com/xm/core/entity/XmProject.java index 583c2190..ce3c4ccd 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProject.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProject.java @@ -9,7 +9,7 @@ import java.math.BigDecimal; /** * 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmProject所有属性名:
- * "id","项目编号","code","项目代号","name","项目名称","xmType","项目类型","startTime","项目开始时间","endTime","项目结束时间","urgent","紧急程度","priority","优先程度","description","项目描述","createUserid","项目创建人编号","createUsername","项目创建人","createTime","创建时间","assess","项目考核","assessRemarks","考核备注","status","0|初始1|售前2|立项中3|实施中4|暂停中5|结项中6|已结项7|售后8|已完成9|已关闭","branchId","机构编号","planTotalCost","总预算","bizProcInstId","当前流程实例编号","bizFlowState","当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除","planNouserAt","非人力成本总预算-应该大于或等于阶段计划非人力总成本","planIuserAt","内部人力成本总预算-应该大于或等于阶段计划内部人力总成本","planOuserAt","外购人力成本总预算-应该大于或等于阶段计划外购人力总成本","locked","是否锁定整个项目不允许变化0否1是","baseTime","基线时间","baseRemark","基线备注","baselineId","基线主键","planWorkload","总预算工作量-应该大于或等于阶段计划总工作量","totalReceivables","总预计收款金额","budgetMarginRate","预估毛利率","contractAmt","合同总金额","planIuserPrice","内部人力成本单价元/人时","planOuserPrice","外购人力成本单价元/人时","planOuserCnt","外购人数","planIuserCnt","内部人数","planWorkingHours","预计工作小时数目","taxRate","税率0-100之间","planIuserWorkload","内部人力总工作量-应该大于或等于阶段计划内部人力总成本","planOuserWorkload","外购人力总工作量-应该大于或等于阶段计划外购人力总成本","fromTplId","关联模板编号","budgetCtrl","是否进行预算控制，计划中一级计划总预算大于项目预算则拒绝添加计划,一般用于瀑布型项目","deptid","部门编号","showOut","是否对外公开0-完全不可见，1-仅本司人员可见，2-关联人员可见（众包-外包-招投标）","isTpl","是否为模板","pmUserid","项目经理编号","pmUsername","项目经理名称","assUserid","助理、副经理编号","assUsername","助理、副经理姓名","admUserid","主管领导编号","admUsername","主管领导姓名","budgetEarly","是否进行计划预算预警，计划预算超出项目预算既定额度进行预警","phaseActCtrl","计划是否进行实际金额控制，实际金额不能大于预算金额（大于预算金额不得结算）","del","是否已删除0否1是","ltime","最后更新时间","ostatus","原状态，暂停时记录原状态，暂停恢复后把原状态恢复","workType","工作方式1-scrum、2-kanban","wtype","报工方式0-无须报工，1-每日报工，2-工期内报工","earlyAmt","超出预算金额多少金额进行预警，正数代表超出的额度，负数代表距离预算的额度","maxTaskAmt","单个任务最大金额","menuLink","任务是否必须严格关联用户故事，0不限制，1必须关联，2-完全不关联","phaseLink","任务是否必须关联计划，0-不限制，1必须关联，2完全不关联";
+ * "id","项目编号","code","项目代号","name","项目名称","xmType","项目类型","startTime","项目开始时间","endTime","项目结束时间","urgent","紧急程度","priority","优先程度","description","项目描述","createUserid","项目创建人编号","createUsername","项目创建人","createTime","创建时间","assess","项目考核","assessRemarks","考核备注","status","0|初始1|售前2|立项中3|实施中4|暂停中5|结项中6|已结项7|售后8|已完成9|已关闭","branchId","机构编号","planTotalCost","总预算","bizProcInstId","当前流程实例编号","bizFlowState","当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除","planNouserAt","非人力成本总预算-应该大于或等于阶段计划非人力总成本","planIuserAt","内部人力成本总预算-应该大于或等于阶段计划内部人力总成本","planOuserAt","外购人力成本总预算-应该大于或等于阶段计划外购人力总成本","locked","是否锁定整个项目不允许变化0否1是","baseTime","基线时间","baseRemark","基线备注","baselineId","基线主键","planWorkload","总预算工作量-应该大于或等于阶段计划总工作量","totalReceivables","总预计收款金额","budgetMarginRate","预估毛利率","contractAmt","合同总金额","planIuserPrice","内部人力成本单价元/人时","planOuserPrice","外购人力成本单价元/人时","planOuserCnt","外购人数","planIuserCnt","内部人数","planWorkingHours","预计工作小时数目","taxRate","税率0-100之间","planIuserWorkload","内部人力总工作量-应该大于或等于阶段计划内部人力总成本","planOuserWorkload","外购人力总工作量-应该大于或等于阶段计划外购人力总成本","fromTplId","关联模板编号","budgetCtrl","是否进行预算控制，计划中一级计划总预算大于项目预算则拒绝添加计划,一般用于瀑布型项目","deptid","部门编号","showOut","是否对外公开0-完全不可见，1-仅本司人员可见，2-关联人员可见（众包-外包-招投标）","isTpl","是否为模板","pmUserid","项目经理编号","pmUsername","项目经理名称","assUserid","助理、副经理编号","assUsername","助理、副经理姓名","admUserid","主管领导编号","admUsername","主管领导姓名","budgetEarly","是否进行计划预算预警，计划预算超出项目预算既定额度进行预警","phaseActCtrl","计划是否进行实际金额控制，实际金额不能大于预算金额（大于预算金额不得结算）","del","是否已删除0否1是","ltime","最后更新时间","ostatus","原状态，暂停时记录原状态，暂停恢复后把原状态恢复","workType","工作方式1-scrum、2-kanban","wtype","报工方式0-无须报工，1-每日报工，2-工期内报工","earlyAmt","超出预算金额多少金额进行预警，正数代表超出的额度，负数代表距离预算的额度","maxTaskAmt","单个任务最大金额","menuLink","任务是否必须严格关联用户故事，0不限制，1必须关联，2-完全不关联","phaseLink","任务是否必须关联计划，0-不限制，1必须关联，2完全不关联","tplType","模板类型1-全域公开，2-本机构公开";
* 当前主键(包括多主键):
* id;
*/ @@ -199,6 +199,9 @@ public class XmProject implements java.io.Serializable { @ApiModelProperty(notes="任务是否必须关联计划，0-不限制，1必须关联，2完全不关联",allowEmptyValue=true,example="",allowableValues="") String phaseLink; + + @ApiModelProperty(notes="模板类型1-全域公开，2-本机构公开",allowEmptyValue=true,example="",allowableValues="") + String tplType; /** *项目编号 diff --git a/xm-core/src/main/java/com/xm/share/ctrl/ShareBizInfoController.java b/xm-core/src/main/java/com/xm/share/ctrl/ShareBizInfoController.java deleted file mode 100644 index d4edec6a..00000000 --- a/xm-core/src/main/java/com/xm/share/ctrl/ShareBizInfoController.java +++ /dev/null @@ -1,190 +0,0 @@ -package com.xm.share.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.xm.share.entity.ShareBizInfo; -import com.xm.share.service.ShareBizInfoService; -import com.xm.share.service.ShareReceInfoService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * url编制采用rest风格,如对XM.xm_share_biz_info 分享行为记录表的操作有增删改查,对应的url分别为:
- * 新增: share/shareBizInfo/add
- * 查询: share/shareBizInfo/list
- * 模糊查询: share/shareBizInfo/listKey
- * 修改: share/shareBizInfo/edit
- * 删除: share/shareBizInfo/del
- * 批量删除: share/shareBizInfo/batchDel
- * 组织 com 顶级模块 xm 大模块 share 小模块
- * 实体 ShareBizInfo 表 XM.xm_share_biz_info 当前主键(包括多主键): share_key; - ***/ -@RestController("xm.share.shareBizInfoController") -@RequestMapping(value="/**/share/shareBizInfo") -@Api(tags={"分享行为记录表操作接口"}) -public class ShareBizInfoController { - - static Logger logger =LoggerFactory.getLogger(ShareBizInfoController.class); - - @Autowired - private ShareBizInfoService shareBizInfoService; - - @Autowired - private ShareReceInfoService shareReceInfoService; - - - @ApiOperation( value = "查询分享行为记录表信息列表",notes=" ") - @ApiResponses({ - @ApiResponse(code = 200,response=ShareBizInfo.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") - }) - @RequestMapping(value="/list",method=RequestMethod.GET) - public Map listShareBizInfo( @ApiIgnore @RequestParam Map shareBizInfo){ - Map m = new HashMap<>(); - RequestUtils.transformArray(shareBizInfo, "shareKeys"); - PageUtils.startPage(shareBizInfo); - List> shareBizInfoList = shareBizInfoService.selectListMapByWhere(shareBizInfo); //列出ShareBizInfo列表 - PageUtils.responePage(m, shareBizInfoList); - m.put("data",shareBizInfoList); - Tips tips=new Tips("查询成功"); - m.put("tips", tips); - return m; - } - - - - /***/ - @ApiOperation( value = "新增一条分享行为记录表信息",notes=" ") - @ApiResponses({ - @ApiResponse(code = 200,response=ShareBizInfo.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") - }) - @RequestMapping(value="/add",method=RequestMethod.POST) - public Map addShareBizInfo(@RequestBody ShareBizInfo shareBizInfo) { - Map m = new HashMap<>(); - Tips tips=new Tips("成功新增一条数据"); - try{ - shareBizInfo.setShareKey(shareBizInfoService.createKey("shareKey")); - //todo 检查是否已经分享过 通过biz_pk_id+share_userid进行判断 - ShareBizInfo queryBizInfo=new ShareBizInfo(); - queryBizInfo.setBizPkId(shareBizInfo.getBizPkId()); - queryBizInfo.setBizType(shareBizInfo.getBizType()); - queryBizInfo.setBizSubPkId(shareBizInfo.getBizSubPkId()); - queryBizInfo.setShareUserid(shareBizInfo.getShareUserid()); - List myShareBizInfos=shareBizInfoService.selectListByWhere(queryBizInfo); - if(myShareBizInfos!=null && myShareBizInfos.size()>0){ - tips.setOkMsg("分享成功"); - m.put("tips", tips); - m.put("data",myShareBizInfos.get(0)); - return m; - } - //todo 检查我是否接受的别人的分享的第二次分享 通过biz_pk_id+share_userid判断 - ShareBizInfo queryBizInfo2=new ShareBizInfo(); - queryBizInfo2.setBizPkId(shareBizInfo.getBizPkId()); - queryBizInfo2.setBizType(shareBizInfo.getBizType()); - queryBizInfo2.setBizSubPkId(shareBizInfo.getBizSubPkId()); - queryBizInfo2.setShareUserid(shareBizInfo.getShareUserid()); - List myParentShareBizInfos=shareBizInfoService.selectList("selectMyParentShareBizInfo",queryBizInfo2); - if(myParentShareBizInfos!=null && myParentShareBizInfos.size()>0){ - ShareBizInfo myParentShareBizInfoDb=myParentShareBizInfos.get(0); - shareBizInfo.setPshareKey(myParentShareBizInfoDb.getShareKey()); - shareBizInfo.setPshareUserid(myParentShareBizInfoDb.getShareUserid()); - shareBizInfo.setPshareUsername(myParentShareBizInfoDb.getShareUsername()); - } - shareBizInfoService.insert(shareBizInfo); - m.put("data",shareBizInfo); - }catch (BizException e) { - tips=e.getTips(); - logger.error("",e); - }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); - logger.error("",e); - } - m.put("tips", tips); - return m; - } - - - /** - @ApiOperation( value = "删除一条分享行为记录表信息",notes=" ") - @ApiResponses({ - @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}") - }) - @RequestMapping(value="/del",method=RequestMethod.POST) - public Map delShareBizInfo(@RequestBody ShareBizInfo shareBizInfo){ - Map m = new HashMap<>(); - Tips tips=new Tips("成功删除一条数据"); - try{ - shareBizInfoService.deleteByPk(shareBizInfo); - }catch (BizException e) { - tips=e.getTips(); - logger.error("",e); - }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); - logger.error("",e); - } - m.put("tips", tips); - return m; - } - */ - - /** - @ApiOperation( value = "根据主键修改一条分享行为记录表信息",notes=" ") - @ApiResponses({ - @ApiResponse(code = 200,response=ShareBizInfo.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") - }) - @RequestMapping(value="/edit",method=RequestMethod.POST) - public Map editShareBizInfo(@RequestBody ShareBizInfo shareBizInfo) { - Map m = new HashMap<>(); - Tips tips=new Tips("成功更新一条数据"); - try{ - shareBizInfoService.updateByPk(shareBizInfo); - m.put("data",shareBizInfo); - }catch (BizException e) { - tips=e.getTips(); - logger.error("",e); - }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); - logger.error("",e); - } - m.put("tips", tips); - return m; - } - */ - - - - /** - @ApiOperation( value = "根据主键列表批量删除分享行为记录表信息",notes=" ") - @ApiResponses({ - @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}") - }) - @RequestMapping(value="/batchDel",method=RequestMethod.POST) - public Map batchDelShareBizInfo(@RequestBody List shareBizInfos) { - Map m = new HashMap<>(); - Tips tips=new Tips("成功删除"+shareBizInfos.size()+"条数据"); - try{ - shareBizInfoService.batchDelete(shareBizInfos); - }catch (BizException e) { - tips=e.getTips(); - logger.error("",e); - }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); - logger.error("",e); - } - m.put("tips", tips); - return m; - } - */ -} diff --git a/xm-core/src/main/java/com/xm/share/ctrl/ShareReceInfoController.java b/xm-core/src/main/java/com/xm/share/ctrl/ShareReceInfoController.java deleted file mode 100644 index 2e6ba851..00000000 --- a/xm-core/src/main/java/com/xm/share/ctrl/ShareReceInfoController.java +++ /dev/null @@ -1,169 +0,0 @@ -package com.xm.share.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.xm.share.entity.ShareReceInfo; -import com.xm.share.service.ShareReceInfoService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -/** - * url编制采用rest风格,如对XM.xm_share_rece_info 分享后接收人行为记录表的操作有增删改查,对应的url分别为:
- * 新增: share/shareReceInfo/add
- * 查询: share/shareReceInfo/list
- * 模糊查询: share/shareReceInfo/listKey
- * 修改: share/shareReceInfo/edit
- * 删除: share/shareReceInfo/del
- * 批量删除: share/shareReceInfo/batchDel
- * 组织 com 顶级模块 xm 大模块 share 小模块
- * 实体 ShareReceInfo 表 XM.xm_share_rece_info 当前主键(包括多主键): id; - ***/ -@RestController("xm.share.shareReceInfoController") -@RequestMapping(value="/**/share/shareReceInfo") -@Api(tags={"分享后接收人行为记录表操作接口"}) -public class ShareReceInfoController { - - static Logger logger =LoggerFactory.getLogger(ShareReceInfoController.class); - - @Autowired - private ShareReceInfoService shareReceInfoService; - - - - - @ApiOperation( value = "查询分享后接收人行为记录表信息列表",notes=" ") - @ApiResponses({ - @ApiResponse(code = 200,response=ShareReceInfo.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") - }) - @RequestMapping(value="/list",method=RequestMethod.GET) - public Map listShareReceInfo( @ApiIgnore @RequestParam Map shareReceInfo){ - Map m = new HashMap<>(); - RequestUtils.transformArray(shareReceInfo, "ids"); - PageUtils.startPage(shareReceInfo); - List> shareReceInfoList = shareReceInfoService.selectListMapByWhere(shareReceInfo); //列出ShareReceInfo列表 - PageUtils.responePage(m, shareReceInfoList); - m.put("data",shareReceInfoList); - Tips tips=new Tips("查询成功"); - m.put("tips", tips); - return m; - } - - - - /** - */ - @ApiOperation( value = "新增一条分享后接收人行为记录表信息",notes=" ") - @ApiResponses({ - @ApiResponse(code = 200,response=ShareReceInfo.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") - }) - @RequestMapping(value="/add",method=RequestMethod.POST) - public Map addShareReceInfo(@RequestBody ShareReceInfo shareReceInfo) { - Map m = new HashMap<>(); - Tips tips=new Tips("成功新增一条数据"); - try{ - shareReceInfo.setId(shareReceInfoService.createKey("id")); - ShareReceInfo query=new ShareReceInfo(); - query.setShareKey(shareReceInfo.getShareKey()); - query.setReceiverId(shareReceInfo.getReceiverId()); - List myShareReceInfos=this.shareReceInfoService.selectListByWhere(query); - if(myShareReceInfos!=null && myShareReceInfos.size()>0){ - tips.setOkMsg("成功"); - m.put("tips", tips); - } - shareReceInfoService.insert(shareReceInfo); - m.put("data",shareReceInfo); - }catch (BizException e) { - tips=e.getTips(); - logger.error("",e); - }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); - logger.error("",e); - } - m.put("tips", tips); - return m; - } - - /** - @ApiOperation( value = "删除一条分享后接收人行为记录表信息",notes=" ") - @ApiResponses({ - @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}") - }) - @RequestMapping(value="/del",method=RequestMethod.POST) - public Map delShareReceInfo(@RequestBody ShareReceInfo shareReceInfo){ - Map m = new HashMap<>(); - Tips tips=new Tips("成功删除一条数据"); - try{ - shareReceInfoService.deleteByPk(shareReceInfo); - }catch (BizException e) { - tips=e.getTips(); - logger.error("",e); - }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); - logger.error("",e); - } - m.put("tips", tips); - return m; - } - */ - - /** - @ApiOperation( value = "根据主键修改一条分享后接收人行为记录表信息",notes=" ") - @ApiResponses({ - @ApiResponse(code = 200,response=ShareReceInfo.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") - }) - @RequestMapping(value="/edit",method=RequestMethod.POST) - public Map editShareReceInfo(@RequestBody ShareReceInfo shareReceInfo) { - Map m = new HashMap<>(); - Tips tips=new Tips("成功更新一条数据"); - try{ - shareReceInfoService.updateByPk(shareReceInfo); - m.put("data",shareReceInfo); - }catch (BizException e) { - tips=e.getTips(); - logger.error("",e); - }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); - logger.error("",e); - } - m.put("tips", tips); - return m; - } - */ - - - - /** - @ApiOperation( value = "根据主键列表批量删除分享后接收人行为记录表信息",notes=" ") - @ApiResponses({ - @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}") - }) - @RequestMapping(value="/batchDel",method=RequestMethod.POST) - public Map batchDelShareReceInfo(@RequestBody List shareReceInfos) { - Map m = new HashMap<>(); - Tips tips=new Tips("成功删除"+shareReceInfos.size()+"条数据"); - try{ - shareReceInfoService.batchDelete(shareReceInfos); - }catch (BizException e) { - tips=e.getTips(); - logger.error("",e); - }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); - logger.error("",e); - } - m.put("tips", tips); - return m; - } - */ -} diff --git a/xm-core/src/main/java/com/xm/share/entity/ShareBizInfo.java b/xm-core/src/main/java/com/xm/share/entity/ShareBizInfo.java deleted file mode 100644 index 9ab9990d..00000000 --- a/xm-core/src/main/java/com/xm/share/entity/ShareBizInfo.java +++ /dev/null @@ -1,289 +0,0 @@ -package com.xm.share.entity; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -import java.util.Date; - -/** - * 组织 com 顶级模块 xm 大模块 share 小模块
- * 实体 ShareBizInfo所有属性名:
- * shareKey,shareUserid,shareUsername,pageUrl,pageType,shareTime,bizPkId,bizBranchId,shareBranchId,bizSubPkId,params,shareType,pshareKey,pshareUserid,pshareUsername,bizType,bizCategoryId;
- * 表 XM.xm_share_biz_info 分享行为记录表的所有字段名:
- * share_key,share_userid,share_username,page_url,page_type,share_time,biz_pk_id,biz_branch_id,share_branch_id,biz_sub_pk_id,params,share_type,pshare_key,pshare_userid,pshare_username,biz_type,biz_category_id;
- * 当前主键(包括多主键):
- * share_key;
- */ -@ApiModel(description="分享行为记录表") -public class ShareBizInfo implements java.io.Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(notes="分享编号，一次分享行为一个shareKey,分享链接之间前端传递；,主键",allowEmptyValue=true,example="",allowableValues="") - String shareKey; - - - @ApiModelProperty(notes="分享人编号",allowEmptyValue=true,example="",allowableValues="") - String shareUserid; - - @ApiModelProperty(notes="分享人姓名",allowEmptyValue=true,example="",allowableValues="") - String shareUsername; - - @ApiModelProperty(notes="分享地址",allowEmptyValue=true,example="",allowableValues="") - String pageUrl; - - @ApiModelProperty(notes="分享地址类型0-h5,1-微信小程序,2-微信公众号,3-app页面",allowEmptyValue=true,example="",allowableValues="") - String pageType; - - @ApiModelProperty(notes="分享时间",allowEmptyValue=true,example="",allowableValues="") - Date shareTime; - - @ApiModelProperty(notes="分享的业务对应的主键",allowEmptyValue=true,example="",allowableValues="") - String bizPkId; - - @ApiModelProperty(notes="分享的业务所属机构号",allowEmptyValue=true,example="",allowableValues="") - String bizBranchId; - - @ApiModelProperty(notes="分享人所属机构号",allowEmptyValue=true,example="",allowableValues="") - String shareBranchId; - - @ApiModelProperty(notes="分享的业务对应的子主键（复合主键下使用）",allowEmptyValue=true,example="",allowableValues="") - String bizSubPkId; - - @ApiModelProperty(notes="分享参数，需要特殊扩展时使用",allowEmptyValue=true,example="",allowableValues="") - String params; - - @ApiModelProperty(notes="分享业务类型",allowEmptyValue=true,example="",allowableValues="") - String shareType; - - @ApiModelProperty(notes="上级分享码，冗余字段，方便计算",allowEmptyValue=true,example="",allowableValues="") - String pshareKey; - - @ApiModelProperty(notes="上级分享人编号，冗余字段，方便计算",allowEmptyValue=true,example="",allowableValues="") - String pshareUserid; - - @ApiModelProperty(notes="上级分享人姓名，冗余字段，方便计算",allowEmptyValue=true,example="",allowableValues="") - String pshareUsername; - - @ApiModelProperty(notes="业务分类0商品1项目2任务3需求4app",allowEmptyValue=true,example="",allowableValues="") - String bizType; - - @ApiModelProperty(notes="业务分类的主键，用于与分佣方案比对，分佣方案是可以针对一类商品进行分佣，可以对于具体的商品进行分佣",allowEmptyValue=true,example="",allowableValues="") - String bizCategoryId; - - /**分享编号，一次分享行为一个shareKey,分享链接之间前端传递；**/ - public ShareBizInfo(String shareKey) { - this.shareKey = shareKey; - } - - /**分享行为记录表**/ - public ShareBizInfo() { - } - - /** - * 分享编号，一次分享行为一个shareKey,分享链接之间前端传递； - **/ - public void setShareKey(String shareKey) { - this.shareKey = shareKey; - } - /** - * 分享人编号 - **/ - public void setShareUserid(String shareUserid) { - this.shareUserid = shareUserid; - } - /** - * 分享人姓名 - **/ - public void setShareUsername(String shareUsername) { - this.shareUsername = shareUsername; - } - /** - * 分享地址 - **/ - public void setPageUrl(String pageUrl) { - this.pageUrl = pageUrl; - } - /** - * 分享地址类型0-h5,1-微信小程序,2-微信公众号,3-app页面 - **/ - public void setPageType(String pageType) { - this.pageType = pageType; - } - /** - * 分享时间 - **/ - public void setShareTime(Date shareTime) { - this.shareTime = shareTime; - } - /** - * 分享的业务对应的主键 - **/ - public void setBizPkId(String bizPkId) { - this.bizPkId = bizPkId; - } - /** - * 分享的业务所属机构号 - **/ - public void setBizBranchId(String bizBranchId) { - this.bizBranchId = bizBranchId; - } - /** - * 分享人所属机构号 - **/ - public void setShareBranchId(String shareBranchId) { - this.shareBranchId = shareBranchId; - } - /** - * 分享的业务对应的子主键（复合主键下使用） - **/ - public void setBizSubPkId(String bizSubPkId) { - this.bizSubPkId = bizSubPkId; - } - /** - * 分享参数，需要特殊扩展时使用 - **/ - public void setParams(String params) { - this.params = params; - } - /** - * 分享业务类型 - **/ - public void setShareType(String shareType) { - this.shareType = shareType; - } - /** - * 上级分享码，冗余字段，方便计算 - **/ - public void setPshareKey(String pshareKey) { - this.pshareKey = pshareKey; - } - /** - * 上级分享人编号，冗余字段，方便计算 - **/ - public void setPshareUserid(String pshareUserid) { - this.pshareUserid = pshareUserid; - } - /** - * 上级分享人姓名，冗余字段，方便计算 - **/ - public void setPshareUsername(String pshareUsername) { - this.pshareUsername = pshareUsername; - } - /** - * 业务分类0商品1项目2任务3需求4app - **/ - public void setBizType(String bizType) { - this.bizType = bizType; - } - /** - * 业务分类的主键，用于与分佣方案比对，分佣方案是可以针对一类商品进行分佣，可以对于具体的商品进行分佣 - **/ - public void setBizCategoryId(String bizCategoryId) { - this.bizCategoryId = bizCategoryId; - } - - /** - * 分享编号，一次分享行为一个shareKey,分享链接之间前端传递； - **/ - public String getShareKey() { - return this.shareKey; - } - /** - * 分享人编号 - **/ - public String getShareUserid() { - return this.shareUserid; - } - /** - * 分享人姓名 - **/ - public String getShareUsername() { - return this.shareUsername; - } - /** - * 分享地址 - **/ - public String getPageUrl() { - return this.pageUrl; - } - /** - * 分享地址类型0-h5,1-微信小程序,2-微信公众号,3-app页面 - **/ - public String getPageType() { - return this.pageType; - } - /** - * 分享时间 - **/ - public Date getShareTime() { - return this.shareTime; - } - /** - * 分享的业务对应的主键 - **/ - public String getBizPkId() { - return this.bizPkId; - } - /** - * 分享的业务所属机构号 - **/ - public String getBizBranchId() { - return this.bizBranchId; - } - /** - * 分享人所属机构号 - **/ - public String getShareBranchId() { - return this.shareBranchId; - } - /** - * 分享的业务对应的子主键（复合主键下使用） - **/ - public String getBizSubPkId() { - return this.bizSubPkId; - } - /** - * 分享参数，需要特殊扩展时使用 - **/ - public String getParams() { - return this.params; - } - /** - * 分享业务类型 - **/ - public String getShareType() { - return this.shareType; - } - /** - * 上级分享码，冗余字段，方便计算 - **/ - public String getPshareKey() { - return this.pshareKey; - } - /** - * 上级分享人编号，冗余字段，方便计算 - **/ - public String getPshareUserid() { - return this.pshareUserid; - } - /** - * 上级分享人姓名，冗余字段，方便计算 - **/ - public String getPshareUsername() { - return this.pshareUsername; - } - /** - * 业务分类0商品1项目2任务3需求4app - **/ - public String getBizType() { - return this.bizType; - } - /** - * 业务分类的主键，用于与分佣方案比对，分佣方案是可以针对一类商品进行分佣，可以对于具体的商品进行分佣 - **/ - public String getBizCategoryId() { - return this.bizCategoryId; - } - -} \ No newline at end of file diff --git a/xm-core/src/main/java/com/xm/share/entity/ShareReceInfo.java b/xm-core/src/main/java/com/xm/share/entity/ShareReceInfo.java deleted file mode 100644 index 489b17d1..00000000 --- a/xm-core/src/main/java/com/xm/share/entity/ShareReceInfo.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.xm.share.entity; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -import java.util.Date; - -/** - * 组织 com 顶级模块 xm 大模块 share 小模块
- * 实体 ShareReceInfo所有属性名:
- * id,shareKey,receiverId,receiverName,receTime;
- * 表 XM.xm_share_rece_info 分享后接收人行为记录表的所有字段名:
- * id,share_key,receiver_id,receiver_name,rece_time;
- * 当前主键(包括多主键):
- * id;
- */ -@ApiModel(description="分享后接收人行为记录表") -public class ShareReceInfo 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 shareKey; - - @ApiModelProperty(notes="接收人编号",allowEmptyValue=true,example="",allowableValues="") - String receiverId; - - @ApiModelProperty(notes="接收入姓名",allowEmptyValue=true,example="",allowableValues="") - String receiverName; - - @ApiModelProperty(notes="接收时间",allowEmptyValue=true,example="",allowableValues="") - Date receTime; - - /**主键**/ - public ShareReceInfo(String id) { - this.id = id; - } - - /**分享后接收人行为记录表**/ - public ShareReceInfo() { - } - - /** - * 主键 - **/ - public void setId(String id) { - this.id = id; - } - /** - * 分享编号，分享链接之间前端传递 - **/ - public void setShareKey(String shareKey) { - this.shareKey = shareKey; - } - /** - * 接收人编号 - **/ - public void setReceiverId(String receiverId) { - this.receiverId = receiverId; - } - /** - * 接收入姓名 - **/ - public void setReceiverName(String receiverName) { - this.receiverName = receiverName; - } - /** - * 接收时间 - **/ - public void setReceTime(Date receTime) { - this.receTime = receTime; - } - - /** - * 主键 - **/ - public String getId() { - return this.id; - } - /** - * 分享编号，分享链接之间前端传递 - **/ - public String getShareKey() { - return this.shareKey; - } - /** - * 接收人编号 - **/ - public String getReceiverId() { - return this.receiverId; - } - /** - * 接收入姓名 - **/ - public String getReceiverName() { - return this.receiverName; - } - /** - * 接收时间 - **/ - public Date getReceTime() { - return this.receTime; - } - -} \ No newline at end of file diff --git a/xm-core/src/main/java/com/xm/share/service/ShareBizInfoService.java b/xm-core/src/main/java/com/xm/share/service/ShareBizInfoService.java deleted file mode 100644 index a294f772..00000000 --- a/xm-core/src/main/java/com/xm/share/service/ShareBizInfoService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.xm.share.service; - -import com.mdp.core.service.BaseService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; -/** - * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
- * 组织 com 顶级模块 xm 大模块 share 小模块
- * 实体 ShareBizInfo 表 XM.xm_share_biz_info 当前主键(包括多主键): share_key; - ***/ -@Service("xm.share.shareBizInfoService") -public class ShareBizInfoService extends BaseService { - static Logger logger =LoggerFactory.getLogger(ShareBizInfoService.class); - /** 请在此类添加自定义函数 */ - -} - diff --git a/xm-core/src/main/java/com/xm/share/service/ShareReceInfoService.java b/xm-core/src/main/java/com/xm/share/service/ShareReceInfoService.java deleted file mode 100644 index 0aa566d0..00000000 --- a/xm-core/src/main/java/com/xm/share/service/ShareReceInfoService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.xm.share.service; - -import com.mdp.core.service.BaseService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; -/** - * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
- * 组织 com 顶级模块 xm 大模块 share 小模块
- * 实体 ShareReceInfo 表 XM.xm_share_rece_info 当前主键(包括多主键): id; - ***/ -@Service("xm.share.shareReceInfoService") -public class ShareReceInfoService extends BaseService { - static Logger logger =LoggerFactory.getLogger(ShareReceInfoService.class); - /** 请在此类添加自定义函数 */ - -} - diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml index cc5733b1..392bbd4b 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml @@ -129,7 +129,7 @@ insert into xm_project( ) values ( - #{id},#{code},#{name},#{xmType},#{startTime},#{endTime},#{urgent},#{priority},#{description},#{createUserid},#{createUsername},#{createTime},#{assess},#{assessRemarks},#{status},#{branchId},#{planTotalCost},#{bizProcInstId},#{bizFlowState},#{planNouserAt},#{planIuserAt},#{planOuserAt},#{locked},#{baseTime},#{baseRemark},#{baselineId},#{planWorkload},#{totalReceivables},#{budgetMarginRate},#{contractAmt},#{planIuserPrice},#{planOuserPrice},#{planOuserCnt},#{planIuserCnt},#{planWorkingHours},#{taxRate},#{planIuserWorkload},#{planOuserWorkload},#{fromTplId},#{budgetCtrl},#{deptid},#{showOut},#{isTpl},#{pmUserid},#{pmUsername},#{assUserid},#{assUsername},#{admUserid},#{admUsername},#{budgetEarly},#{phaseActCtrl},#{del},#{ltime},#{ostatus},#{workType},#{wtype},#{earlyAmt},#{maxTaskAmt},#{menuLink},#{phaseLink} + #{id},#{code},#{name},#{xmType},#{startTime},#{endTime},#{urgent},#{priority},#{description},#{createUserid},#{createUsername},#{createTime},#{assess},#{assessRemarks},#{status},#{branchId},#{planTotalCost},#{bizProcInstId},#{bizFlowState},#{planNouserAt},#{planIuserAt},#{planOuserAt},#{locked},#{baseTime},#{baseRemark},#{baselineId},#{planWorkload},#{totalReceivables},#{budgetMarginRate},#{contractAmt},#{planIuserPrice},#{planOuserPrice},#{planOuserCnt},#{planIuserCnt},#{planWorkingHours},#{taxRate},#{planIuserWorkload},#{planOuserWorkload},#{fromTplId},#{budgetCtrl},#{deptid},#{showOut},#{isTpl},#{pmUserid},#{pmUsername},#{assUserid},#{assUsername},#{admUserid},#{admUsername},#{budgetEarly},#{phaseActCtrl},#{del},#{ltime},#{ostatus},#{workType},#{wtype},#{earlyAmt},#{maxTaskAmt},#{menuLink},#{phaseLink},#{tplType} ) @@ -204,7 +204,7 @@ - id,code,name,xm_type,start_time,end_time,urgent,priority,description,create_userid,create_username,create_time,assess,assess_remarks,status,branch_id,plan_total_cost,biz_proc_inst_id,biz_flow_state,plan_nouser_at,plan_iuser_at,plan_ouser_at,locked,base_time,base_remark,baseline_id,plan_workload,total_receivables,budget_margin_rate,contract_amt,plan_iuser_price,plan_ouser_price,plan_ouser_cnt,plan_iuser_cnt,plan_working_hours,tax_rate,plan_iuser_workload,plan_ouser_workload,from_tpl_id,budget_ctrl,deptid,show_out,is_tpl,pm_userid,pm_username,ass_userid,ass_username,adm_userid,adm_username,budget_early,phase_act_ctrl,del,ltime,ostatus,work_type,wtype,early_amt,max_task_amt,menu_link,phase_link + id,code,name,xm_type,start_time,end_time,urgent,priority,description,create_userid,create_username,create_time,assess,assess_remarks,status,branch_id,plan_total_cost,biz_proc_inst_id,biz_flow_state,plan_nouser_at,plan_iuser_at,plan_ouser_at,locked,base_time,base_remark,baseline_id,plan_workload,total_receivables,budget_margin_rate,contract_amt,plan_iuser_price,plan_ouser_price,plan_ouser_cnt,plan_iuser_cnt,plan_working_hours,tax_rate,plan_iuser_workload,plan_ouser_workload,from_tpl_id,budget_ctrl,deptid,show_out,is_tpl,pm_userid,pm_username,ass_userid,ass_username,adm_userid,adm_username,budget_early,phase_act_ctrl,del,ltime,ostatus,work_type,wtype,early_amt,max_task_amt,menu_link,phase_link,tpl_type @@ -269,6 +269,7 @@ and res.max_task_amt = #{maxTaskAmt} and res.menu_link = #{menuLink} and res.phase_link = #{phaseLink} + and res.tpl_type = #{tplType} @@ -330,7 +331,8 @@ early_amt = #{earlyAmt}, max_task_amt = #{maxTaskAmt}, menu_link = #{menuLink}, - phase_link = #{phaseLink} + phase_link = #{phaseLink}, + tpl_type = #{tplType} code = #{code}, @@ -392,6 +394,7 @@ max_task_amt = #{maxTaskAmt}, menu_link = #{menuLink}, phase_link = #{phaseLink}, + tpl_type = #{tplType}, @@ -453,6 +456,7 @@ early_amt = #{item.earlyAmt}, max_task_amt = #{item.maxTaskAmt}, menu_link = #{item.menuLink}, - phase_link = #{item.phaseLink} + phase_link = #{item.phaseLink}, + tpl_type = #{item.tplType} \ No newline at end of file diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml index 16b50ab8..db1eb7e4 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml @@ -262,10 +262,16 @@ diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/share/dao/ShareBizInfoMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/share/dao/ShareBizInfoMapper.xml deleted file mode 100644 index 532c9280..00000000 --- a/xm-core/src/main/resources/mybatis/mapper/xm/share/dao/ShareBizInfoMapper.xml +++ /dev/null @@ -1,207 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - insert into xm_share_biz_info( - - ) values ( - #{shareKey},#{shareUserid},#{shareUsername},#{pageUrl},#{pageType},#{shareTime},#{bizPkId},#{bizBranchId},#{shareBranchId},#{bizSubPkId},#{params},#{shareType},#{pshareKey},#{pshareUserid},#{pshareUsername},#{bizType},#{bizCategoryId} - ) - - - - - delete from xm_share_biz_info - - 1=2 - - - - - - delete from xm_share_biz_info - where share_key = #{shareKey} - - - - - update xm_share_biz_info - - - - where share_key = #{shareKey} - - - - - update xm_share_biz_info - - - - where share_key = #{shareKey} - - - - - - - - update xm_share_biz_info - set - - where share_key = #{item.shareKey} - - - - - delete from xm_share_biz_info - where - (share_key) - in - - ( #{item.shareKey} - ) - - - - - - - share_key,share_userid,share_username,page_url,page_type,share_time,biz_pk_id,biz_branch_id,share_branch_id,biz_sub_pk_id,params,share_type,pshare_key,pshare_userid,pshare_username,biz_type,biz_category_id - - - - - and res.share_key = #{shareKey} - and res.share_userid = #{shareUserid} - and res.share_username = #{shareUsername} - and res.page_url = #{pageUrl} - and res.page_type = #{pageType} - and date_format(res.share_time,'%Y-%m-%d') = date_format(#{shareTime},'%Y-%m-%d') - and res.biz_pk_id = #{bizPkId} - and res.biz_branch_id = #{bizBranchId} - and res.share_branch_id = #{shareBranchId} - and res.biz_sub_pk_id = #{bizSubPkId} - and res.params = #{params} - and res.share_type = #{shareType} - and res.pshare_key = #{pshareKey} - and res.pshare_userid = #{pshareUserid} - and res.pshare_username = #{pshareUsername} - and res.biz_type = #{bizType} - and res.biz_category_id = #{bizCategoryId} - - - - share_userid = #{shareUserid}, - share_username = #{shareUsername}, - page_url = #{pageUrl}, - page_type = #{pageType}, - share_time = #{shareTime}, - biz_pk_id = #{bizPkId}, - biz_branch_id = #{bizBranchId}, - share_branch_id = #{shareBranchId}, - biz_sub_pk_id = #{bizSubPkId}, - params = #{params}, - share_type = #{shareType}, - pshare_key = #{pshareKey}, - pshare_userid = #{pshareUserid}, - pshare_username = #{pshareUsername}, - biz_type = #{bizType}, - biz_category_id = #{bizCategoryId} - - - share_userid = #{shareUserid}, - share_username = #{shareUsername}, - page_url = #{pageUrl}, - page_type = #{pageType}, - share_time = #{shareTime}, - biz_pk_id = #{bizPkId}, - biz_branch_id = #{bizBranchId}, - share_branch_id = #{shareBranchId}, - biz_sub_pk_id = #{bizSubPkId}, - params = #{params}, - share_type = #{shareType}, - pshare_key = #{pshareKey}, - pshare_userid = #{pshareUserid}, - pshare_username = #{pshareUsername}, - biz_type = #{bizType}, - biz_category_id = #{bizCategoryId}, - - - - share_userid = #{item.shareUserid}, - share_username = #{item.shareUsername}, - page_url = #{item.pageUrl}, - page_type = #{item.pageType}, - share_time = #{item.shareTime}, - biz_pk_id = #{item.bizPkId}, - biz_branch_id = #{item.bizBranchId}, - share_branch_id = #{item.shareBranchId}, - biz_sub_pk_id = #{item.bizSubPkId}, - params = #{item.params}, - share_type = #{item.shareType}, - pshare_key = #{item.pshareKey}, - pshare_userid = #{item.pshareUserid}, - pshare_username = #{item.pshareUsername}, - biz_type = #{item.bizType}, - biz_category_id = #{item.bizCategoryId} - - \ No newline at end of file diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/share/dao/ShareReceInfoMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/share/dao/ShareReceInfoMapper.xml deleted file mode 100644 index 78bdb215..00000000 --- a/xm-core/src/main/resources/mybatis/mapper/xm/share/dao/ShareReceInfoMapper.xml +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - insert into xm_share_rece_info( - - ) values ( - #{id},#{shareKey},#{receiverId},#{receiverName},#{receTime} - ) - - - - - delete from xm_share_rece_info - - 1=2 - - - - - - delete from xm_share_rece_info - where id = #{id} - - - - - update xm_share_rece_info - - - - where id = #{id} - - - - - update xm_share_rece_info - - - - where id = #{id} - - - - - - - - update xm_share_rece_info - set - - where id = #{item.id} - - - - - delete from xm_share_rece_info - where - (id) - in - - ( #{item.id} - ) - - - - - - - id,share_key,receiver_id,receiver_name,rece_time - - - - - and res.id = #{id} - and res.share_key = #{shareKey} - and res.receiver_id = #{receiverId} - and res.receiver_name = #{receiverName} - and date_format(res.rece_time,'%Y-%m-%d') = date_format(#{receTime},'%Y-%m-%d') - - - - share_key = #{shareKey}, - receiver_id = #{receiverId}, - receiver_name = #{receiverName}, - rece_time = #{receTime} - - - share_key = #{shareKey}, - receiver_id = #{receiverId}, - receiver_name = #{receiverName}, - rece_time = #{receTime}, - - - - share_key = #{item.shareKey}, - receiver_id = #{item.receiverId}, - receiver_name = #{item.receiverName}, - rece_time = #{item.receTime} - - \ No newline at end of file diff --git a/xm-core/src/test/java/com/xm/share/ctrl/TestShareBizInfoController.java b/xm-core/src/test/java/com/xm/share/ctrl/TestShareBizInfoController.java deleted file mode 100644 index 69fbff9a..00000000 --- a/xm-core/src/test/java/com/xm/share/ctrl/TestShareBizInfoController.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.xm.share.ctrl; - -import java.text.SimpleDateFormat; -import java.util.*; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; -import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.mock.web.MockHttpServletRequest; -import org.springframework.mock.web.MockHttpServletResponse; -import org.springframework.mock.web.MockHttpSession; -import org.springframework.mock.web.MockServletContext; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.context.request.ServletWebRequest; -import org.springframework.boot.test.context.SpringBootTest; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.springframework.http.MediaType; -import com.xm.share.entity.ShareBizInfo; -import com.mdp.core.utils.BaseUtils; -/** - * 组织 com
- * 顶级模块 xm
- * 大模块 share
- * 小模块
- * 表 XM.xm_share_biz_info 分享行为记录表
- * 实体 ShareBizInfo
- * 表是指数据库结构中的表,实体是指java类型中的实体类
- * 当前实体所有属性名:
- * shareKey,shareUserid,shareUsername,pageUrl,pageType,shareTime,bizPkId,bizBranchId,shareBranchId,bizSubPkId,params,shareType,pshareKey,pshareUserid,pshareUsername,bizType,bizCategoryId;
- * 当前表的所有字段名:
- * share_key,share_userid,share_username,page_url,page_type,share_time,biz_pk_id,biz_branch_id,share_branch_id,biz_sub_pk_id,params,share_type,pshare_key,pshare_userid,pshare_username,biz_type,biz_category_id;
- * 当前主键(包括多主键):
- * share_key;
- **/ -@RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest -public class TestShareBizInfoController { - - @Autowired - public WebApplicationContext wac; // cached - @Autowired - public MockServletContext servletContext; // cached - @Autowired - public MockHttpSession session; - @Autowired - public MockHttpServletRequest request; - @Autowired - public MockHttpServletResponse response; - @Autowired - public ServletWebRequest webRequest; - - public MockMvc mockMvc; - - public MockHttpServletRequestBuilder msrb; - - ObjectMapper om = new ObjectMapper(); - - @Before - public void setup() { - this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build(); - } - - @Test - public void add() throws Exception { - Map p=BaseUtils.map("shareKey","9303","shareUserid","zZoc","shareUsername","V9tr","pageUrl","wBF3","pageType","ylHj","shareTime",new Date("2021-04-22 17:12:53"),"bizPkId","c6DC","bizBranchId","5HjB","shareBranchId","0aSc","bizSubPkId","5ps3","params","b175","shareType","q0Jh","pshareKey","it9W","pshareUserid","IaYJ","pshareUsername","GGIz","bizType","9Uqr","bizCategoryId","FL8C"); - ShareBizInfo shareBizInfo=BaseUtils.fromMap(p,ShareBizInfo.class); - String jsonShareBizInfo=om.writeValueAsString(shareBizInfo); - mockMvc.perform( post("/**/share/shareBizInfo/add").content(jsonShareBizInfo).contentType(MediaType.APPLICATION_JSON)) - .andDo(print()) - .andExpect(status().isOk()) - .andExpect(jsonPath("tips.isOk").value(true)); - } - - @Test - public void list() throws Exception { - mockMvc.perform( get("/**/share/shareBizInfo/list") - .param("shareKey","9303").param("currentPage", "1").param("pageSize", "10")) - .andDo(print()) - .andExpect(status().isOk()) - .andExpect(jsonPath("tips.isOk").value(true)) - .andExpect(jsonPath("data").isArray()) - .andExpect(jsonPath("total").exists()); - } - - @Test - public void edit() throws Exception { - Map p=BaseUtils.map("shareKey","9303","shareUserid","zZoc","shareUsername","V9tr","pageUrl","wBF3","pageType","ylHj","shareTime",new Date("2021-04-22 17:12:53"),"bizPkId","c6DC","bizBranchId","5HjB","shareBranchId","0aSc","bizSubPkId","5ps3","params","b175","shareType","q0Jh","pshareKey","it9W","pshareUserid","IaYJ","pshareUsername","GGIz","bizType","9Uqr","bizCategoryId","FL8C"); - ShareBizInfo shareBizInfo=BaseUtils.fromMap(p,ShareBizInfo.class); - String jsonShareBizInfo=om.writeValueAsString(shareBizInfo); - mockMvc.perform( post("/**/share/shareBizInfo/edit").content(jsonShareBizInfo).contentType(MediaType.APPLICATION_JSON)) - .andDo(print()) - .andExpect(status().isOk()) - .andExpect(jsonPath("tips.isOk").value(true)); - } - - @Test - public void del() throws Exception { - mockMvc.perform( post("/**/share/shareBizInfo/del").content("9303").contentType(MediaType.APPLICATION_JSON)) - .andDo(print()) - .andExpect(status().isOk()) - .andExpect(jsonPath("tips.isOk").value(true)); - } - - @Test - public void batchDel() throws Exception { - Map p=BaseUtils.map("shareKey","9303","shareUserid","zZoc","shareUsername","V9tr","pageUrl","wBF3","pageType","ylHj","shareTime",new Date("2021-04-22 17:12:53"),"bizPkId","c6DC","bizBranchId","5HjB","shareBranchId","0aSc","bizSubPkId","5ps3","params","b175","shareType","q0Jh","pshareKey","it9W","pshareUserid","IaYJ","pshareUsername","GGIz","bizType","9Uqr","bizCategoryId","FL8C"); - ShareBizInfo shareBizInfo=BaseUtils.fromMap(p,ShareBizInfo.class); - List shareBizInfos=new ArrayList<>(); - shareBizInfos.add(shareBizInfo); - String jsonShareBizInfo=om.writeValueAsString(shareBizInfos); - mockMvc.perform( post("/**/share/shareBizInfo/batchDel").content(jsonShareBizInfo).contentType(MediaType.APPLICATION_JSON)) - .andDo(print()) - .andExpect(status().isOk()) - .andExpect(jsonPath("tips.isOk").value(true)); - } - -} diff --git a/xm-core/src/test/java/com/xm/share/ctrl/TestShareReceInfoController.java b/xm-core/src/test/java/com/xm/share/ctrl/TestShareReceInfoController.java deleted file mode 100644 index 76809f7e..00000000 --- a/xm-core/src/test/java/com/xm/share/ctrl/TestShareReceInfoController.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.xm.share.ctrl; - -import java.text.SimpleDateFormat; -import java.util.*; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; -import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.mock.web.MockHttpServletRequest; -import org.springframework.mock.web.MockHttpServletResponse; -import org.springframework.mock.web.MockHttpSession; -import org.springframework.mock.web.MockServletContext; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.context.request.ServletWebRequest; -import org.springframework.boot.test.context.SpringBootTest; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.springframework.http.MediaType; -import com.xm.share.entity.ShareReceInfo; -import com.mdp.core.utils.BaseUtils; -/** - * 组织 com
- * 顶级模块 xm
- * 大模块 share
- * 小模块
- * 表 XM.xm_share_rece_info 分享后接收人行为记录表
- * 实体 ShareReceInfo
- * 表是指数据库结构中的表,实体是指java类型中的实体类
- * 当前实体所有属性名:
- * id,shareKey,receiverId,receiverName,receTime;
- * 当前表的所有字段名:
- * id,share_key,receiver_id,receiver_name,rece_time;
- * 当前主键(包括多主键):
- * id;
- **/ -@RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest -public class TestShareReceInfoController { - - @Autowired - public WebApplicationContext wac; // cached - @Autowired - public MockServletContext servletContext; // cached - @Autowired - public MockHttpSession session; - @Autowired - public MockHttpServletRequest request; - @Autowired - public MockHttpServletResponse response; - @Autowired - public ServletWebRequest webRequest; - - public MockMvc mockMvc; - - public MockHttpServletRequestBuilder msrb; - - ObjectMapper om = new ObjectMapper(); - - @Before - public void setup() { - this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build(); - } - - @Test - public void add() throws Exception { - Map p=BaseUtils.map("id","1zr2","shareKey","dp61","receiverId","9s6n","receiverName","83i7","receTime",new Date("2021-04-22 17:12:53")); - ShareReceInfo shareReceInfo=BaseUtils.fromMap(p,ShareReceInfo.class); - String jsonShareReceInfo=om.writeValueAsString(shareReceInfo); - mockMvc.perform( post("/**/share/shareReceInfo/add").content(jsonShareReceInfo).contentType(MediaType.APPLICATION_JSON)) - .andDo(print()) - .andExpect(status().isOk()) - .andExpect(jsonPath("tips.isOk").value(true)); - } - - @Test - public void list() throws Exception { - mockMvc.perform( get("/**/share/shareReceInfo/list") - .param("id","1zr2").param("currentPage", "1").param("pageSize", "10")) - .andDo(print()) - .andExpect(status().isOk()) - .andExpect(jsonPath("tips.isOk").value(true)) - .andExpect(jsonPath("data").isArray()) - .andExpect(jsonPath("total").exists()); - } - - @Test - public void edit() throws Exception { - Map p=BaseUtils.map("id","1zr2","shareKey","dp61","receiverId","9s6n","receiverName","83i7","receTime",new Date("2021-04-22 17:12:53")); - ShareReceInfo shareReceInfo=BaseUtils.fromMap(p,ShareReceInfo.class); - String jsonShareReceInfo=om.writeValueAsString(shareReceInfo); - mockMvc.perform( post("/**/share/shareReceInfo/edit").content(jsonShareReceInfo).contentType(MediaType.APPLICATION_JSON)) - .andDo(print()) - .andExpect(status().isOk()) - .andExpect(jsonPath("tips.isOk").value(true)); - } - - @Test - public void del() throws Exception { - mockMvc.perform( post("/**/share/shareReceInfo/del").content("1zr2").contentType(MediaType.APPLICATION_JSON)) - .andDo(print()) - .andExpect(status().isOk()) - .andExpect(jsonPath("tips.isOk").value(true)); - } - - @Test - public void batchDel() throws Exception { - Map p=BaseUtils.map("id","1zr2","shareKey","dp61","receiverId","9s6n","receiverName","83i7","receTime",new Date("2021-04-22 17:12:53")); - ShareReceInfo shareReceInfo=BaseUtils.fromMap(p,ShareReceInfo.class); - List shareReceInfos=new ArrayList<>(); - shareReceInfos.add(shareReceInfo); - String jsonShareReceInfo=om.writeValueAsString(shareReceInfos); - mockMvc.perform( post("/**/share/shareReceInfo/batchDel").content(jsonShareReceInfo).contentType(MediaType.APPLICATION_JSON)) - .andDo(print()) - .andExpect(status().isOk()) - .andExpect(jsonPath("tips.isOk").value(true)); - } - -} diff --git a/xm-core/src/test/java/com/xm/share/dao/TestShareBizInfoDao.java b/xm-core/src/test/java/com/xm/share/dao/TestShareBizInfoDao.java deleted file mode 100644 index 1fd8206c..00000000 --- a/xm-core/src/test/java/com/xm/share/dao/TestShareBizInfoDao.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.xm.share.dao; - -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.mdp.core.dao.BaseDao; -import com.mdp.mybatis.PageUtils; -import com.github.pagehelper.Page; -import com.xm.share.entity.ShareBizInfo; -import org.springframework.boot.test.context.SpringBootTest; -/** - * ShareBizInfoDao的测试案例 - * 组织 com
- * 顶级模块 xm
- * 大模块 share
- * 小模块
- * 表 XM.xm_share_biz_info 分享行为记录表
- * 实体 ShareBizInfo
- * 表是指数据库结构中的表,实体是指java类型中的实体类
- * 当前实体所有属性名:
- * shareKey,shareUserid,shareUsername,pageUrl,pageType,shareTime,bizPkId,bizBranchId,shareBranchId,bizSubPkId,params,shareType,pshareKey,pshareUserid,pshareUsername,bizType,bizCategoryId;
- * 当前表的所有字段名:
- * share_key,share_userid,share_username,page_url,page_type,share_time,biz_pk_id,biz_branch_id,share_branch_id,biz_sub_pk_id,params,share_type,pshare_key,pshare_userid,pshare_username,biz_type,biz_category_id;
- * 当前主键(包括多主键):
- * share_key;
- ***/ - @RunWith(SpringJUnit4ClassRunner.class) - @SpringBootTest -public class TestShareBizInfoDao { - - @Autowired - BaseDao baseDao; - - /** - * 新增一条数据 - ***/ - @Test - public void insert() { - Map p=BaseUtils.map("shareKey","9303","shareUserid","zZoc","shareUsername","V9tr","pageUrl","wBF3","pageType","ylHj","shareTime",new Date("2021-04-22 17:12:53"),"bizPkId","c6DC","bizBranchId","5HjB","shareBranchId","0aSc","bizSubPkId","5ps3","params","b175","shareType","q0Jh","pshareKey","it9W","pshareUserid","IaYJ","pshareUsername","GGIz","bizType","9Uqr","bizCategoryId","FL8C"); - ShareBizInfo shareBizInfo=BaseUtils.fromMap(p,ShareBizInfo.class); - baseDao.insert(shareBizInfo); - //Assert.assertEquals(1, result); - } -} diff --git a/xm-core/src/test/java/com/xm/share/dao/TestShareReceInfoDao.java b/xm-core/src/test/java/com/xm/share/dao/TestShareReceInfoDao.java deleted file mode 100644 index 1c1b6e8e..00000000 --- a/xm-core/src/test/java/com/xm/share/dao/TestShareReceInfoDao.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.xm.share.dao; - -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.mdp.core.dao.BaseDao; -import com.mdp.mybatis.PageUtils; -import com.github.pagehelper.Page; -import com.xm.share.entity.ShareReceInfo; -import org.springframework.boot.test.context.SpringBootTest; -/** - * ShareReceInfoDao的测试案例 - * 组织 com
- * 顶级模块 xm
- * 大模块 share
- * 小模块
- * 表 XM.xm_share_rece_info 分享后接收人行为记录表
- * 实体 ShareReceInfo
- * 表是指数据库结构中的表,实体是指java类型中的实体类
- * 当前实体所有属性名:
- * id,shareKey,receiverId,receiverName,receTime;
- * 当前表的所有字段名:
- * id,share_key,receiver_id,receiver_name,rece_time;
- * 当前主键(包括多主键):
- * id;
- ***/ - @RunWith(SpringJUnit4ClassRunner.class) - @SpringBootTest -public class TestShareReceInfoDao { - - @Autowired - BaseDao baseDao; - - /** - * 新增一条数据 - ***/ - @Test - public void insert() { - Map p=BaseUtils.map("id","1zr2","shareKey","dp61","receiverId","9s6n","receiverName","83i7","receTime",new Date("2021-04-22 17:12:53")); - ShareReceInfo shareReceInfo=BaseUtils.fromMap(p,ShareReceInfo.class); - baseDao.insert(shareReceInfo); - //Assert.assertEquals(1, result); - } -} diff --git a/xm-core/src/test/java/com/xm/share/service/TestShareBizInfoService.java b/xm-core/src/test/java/com/xm/share/service/TestShareBizInfoService.java deleted file mode 100644 index 890ca952..00000000 --- a/xm-core/src/test/java/com/xm/share/service/TestShareBizInfoService.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.xm.share.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.share.service.ShareBizInfoService; -import com.mdp.mybatis.PageUtils; -import com.github.pagehelper.Page; -import com.xm.share.entity.ShareBizInfo; -import org.springframework.boot.test.context.SpringBootTest; -/** - * ShareBizInfoService的测试案例 - * 组织 com
- * 顶级模块 xm
- * 大模块 share
- * 小模块
- * 表 XM.xm_share_biz_info 分享行为记录表
- * 实体 ShareBizInfo
- * 表是指数据库结构中的表,实体是指java类型中的实体类
- * 当前实体所有属性名:
- * shareKey,shareUserid,shareUsername,pageUrl,pageType,shareTime,bizPkId,bizBranchId,shareBranchId,bizSubPkId,params,shareType,pshareKey,pshareUserid,pshareUsername,bizType,bizCategoryId;
- * 当前表的所有字段名:
- * share_key,share_userid,share_username,page_url,page_type,share_time,biz_pk_id,biz_branch_id,share_branch_id,biz_sub_pk_id,params,share_type,pshare_key,pshare_userid,pshare_username,biz_type,biz_category_id;
- * 当前主键(包括多主键):
- * share_key;
- ***/ - -@RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest -public class TestShareBizInfoService { - - @Autowired - ShareBizInfoService shareBizInfoService; - - /** - * 新增一条数据 - ***/ - @Test - public void insert() { - Map p=BaseUtils.map("shareKey","9303","shareUserid","zZoc","shareUsername","V9tr","pageUrl","wBF3","pageType","ylHj","shareTime",new Date("2021-04-22 17:12:53"),"bizPkId","c6DC","bizBranchId","5HjB","shareBranchId","0aSc","bizSubPkId","5ps3","params","b175","shareType","q0Jh","pshareKey","it9W","pshareUserid","IaYJ","pshareUsername","GGIz","bizType","9Uqr","bizCategoryId","FL8C"); - ShareBizInfo shareBizInfo=BaseUtils.fromMap(p,ShareBizInfo.class); - shareBizInfoService.insert(shareBizInfo); - //Assert.assertEquals(1, result); - } - -} diff --git a/xm-core/src/test/java/com/xm/share/service/TestShareReceInfoService.java b/xm-core/src/test/java/com/xm/share/service/TestShareReceInfoService.java deleted file mode 100644 index 32c34732..00000000 --- a/xm-core/src/test/java/com/xm/share/service/TestShareReceInfoService.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.xm.share.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.share.service.ShareReceInfoService; -import com.mdp.mybatis.PageUtils; -import com.github.pagehelper.Page; -import com.xm.share.entity.ShareReceInfo; -import org.springframework.boot.test.context.SpringBootTest; -/** - * ShareReceInfoService的测试案例 - * 组织 com
- * 顶级模块 xm
- * 大模块 share
- * 小模块
- * 表 XM.xm_share_rece_info 分享后接收人行为记录表
- * 实体 ShareReceInfo
- * 表是指数据库结构中的表,实体是指java类型中的实体类
- * 当前实体所有属性名:
- * id,shareKey,receiverId,receiverName,receTime;
- * 当前表的所有字段名:
- * id,share_key,receiver_id,receiver_name,rece_time;
- * 当前主键(包括多主键):
- * id;
- ***/ - -@RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest -public class TestShareReceInfoService { - - @Autowired - ShareReceInfoService shareReceInfoService; - - /** - * 新增一条数据 - ***/ - @Test - public void insert() { - Map p=BaseUtils.map("id","1zr2","shareKey","dp61","receiverId","9s6n","receiverName","83i7","receTime",new Date("2021-04-22 17:12:53")); - ShareReceInfo shareReceInfo=BaseUtils.fromMap(p,ShareReceInfo.class); - shareReceInfoService.insert(shareReceInfo); - //Assert.assertEquals(1, result); - } - -}