Browse Source

问题修改

zhanglei
God 2 years ago
parent
commit
5948007ae4
  1. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java
  2. 7
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java
  3. 7
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java
  4. 11
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
  5. 46
      anrui-fin/anrui-fin-biz/src/main/resources/ftl/prePaymentApply.ftl
  6. 2013
      anrui-fin/anrui-fin-biz/src/main/resources/ftl/prePaymentApply1.ftl
  7. 1209
      anrui-fin/anrui-fin-biz/src/main/resources/ftl/新建 DOCX 文档.xml
  8. 62
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowcc/SysFlowcc.java
  9. 69
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowcc/SysFlowccDetailsVo.java
  10. 65
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowcc/SysFlowccDto.java
  11. 78
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowcc/SysFlowccFeign.java
  12. 72
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowcc/SysFlowccFeignFallback.java
  13. 54
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowcc/SysFlowccQuery.java
  14. 63
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowcc/SysFlowccVo.java
  15. 71
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowcc/SysFlowccMapper.java
  16. 13
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowcc/SysFlowccMapper.xml
  17. 105
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowcc/SysFlowccRest.java
  18. 150
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowcc/SysFlowccService.java

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java

@ -149,4 +149,10 @@ public class BaseOutsourcingApplication extends BaseEntity {
@ApiModelProperty("订金使用规则value")
private String depositUseRuleValue; // 订金使用规则value
@ApiModelProperty("是否销售组审批")
private String isSaleOrgApproval; // 是否销售组审批
@ApiModelProperty("销售经理sid")
private String approvalSid; // 销售经理sid
@ApiModelProperty("销售经理姓名")
private String approvalName; // 销售经理姓名
}

7
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java

@ -154,4 +154,11 @@ public class BaseOutsourcingApplicationDetailsVo implements Vo {
private String supplierSid;*/
private String createBySid;
@ApiModelProperty("是否销售组审批")
private String isSaleOrgApproval; // 是否销售组审批
@ApiModelProperty("销售经理sid")
private String approvalSid; // 销售经理sid
@ApiModelProperty("销售经理姓名")
private String approvalName; // 销售经理姓名
}

7
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java

@ -169,6 +169,13 @@ public class BaseOutsourcingApplicationDto implements Dto {
@ApiModelProperty("订金使用规则value")
private String depositUseRuleValue; // 订金使用规则value
@ApiModelProperty("是否销售组审批")
private String isSaleOrgApproval; // 是否销售组审批
@ApiModelProperty("销售经理sid")
private String approvalSid; // 销售经理sid
@ApiModelProperty("销售经理姓名")
private String approvalName; // 销售经理姓名
@ApiModelProperty("外采车辆列表")
private List<BaseOutsourcingApplicationVehicleDto> baseOutsourcingApplicationVehicleDtos; // 外采车辆列表
@ApiModelProperty("合同附件信息")

11
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@ -417,10 +417,14 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
//=================添加app参数结束
bv.setFormVariables(variables);
bv.setModelId(ProcDefEnum.BASEOUTSOURCINGAPPLICATION.getProDefId());
//判断是否有指定审批人
String isSaleOrgApproval = dto.getIsSaleOrgApproval();
if ("1".equals(isSaleOrgApproval)){
bv.setNextNodeUserSids(dto.getApprovalSid());
}
//如果taskid从业务的数据库中查询出来,那这个taskid 和当前的关系是什么 如果数据库中查询出来的taskid是第四个环节的id,但是目前是做的第一次的提交操作。
// 应该是也不允许走if 也不运行走else 那应该如何验证这个id是否允许走else呢?
// 取出来业务数据的taskid和前端传递的taskid作比较 来判断数据的是否有效 本质上是数据版本一致性的问题
ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.startProcess(bv);
UpdateFlowFieldVo uff = resultBean1.getData();
updateFlowFiled(BeanUtil.beanToMap(uff));
@ -465,6 +469,11 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
//=================添加app参数结束
bv.setFormVariables(variables);
bv.setModelId(ProcDefEnum.BASEOUTSOURCINGAPPLICATION.getProDefId());
//判断是否有指定审批人
String isSaleOrgApproval = dto.getIsSaleOrgApproval();
if ("1".equals(isSaleOrgApproval)){
bv.setNextNodeUserSids(dto.getApprovalSid());
}
if (StringUtils.isBlank(businessTaskid) && StringUtils.isBlank(dto.getTaskId())) {
// 新提交 taskid都是空的
saveOrUpdateDto(dto);//update

46
anrui-fin/anrui-fin-biz/src/main/resources/ftl/prePaymentApply.ftl

@ -924,31 +924,29 @@
<w:tc>
<w:tcPr>
<w:tcW w:w="3864" w:type="pct"/>
<w:noWrap w:val="0"/>
<w:vAlign w:val="center"/>
</w:tcPr>
<w:p>
<#list lcList as lc>
<w:pPr>
<w:jc w:val="left"/>
<w:rPr>
<w:rFonts w:hint="default"/>
<w:vertAlign w:val="baseline"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:hint="eastAsia"/>
<w:vertAlign w:val="baseline"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
</w:rPr>
<w:t >
${lc.name!}|${lc.comment!}|${lc.spsj!}
</w:t>
</w:r>
</#list>
</w:p>
<#list lcList as lc>
<w:p>
<w:pPr>
<w:jc w:val="both"/>
<w:rPr>
<w:rFonts w:hint="default"/>
<w:vertAlign w:val="baseline"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:hint="eastAsia"/>
<w:vertAlign w:val="baseline"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
</w:rPr>
<w:t>${lc.name!}&nbsp;${lc.comment!}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${lc.spsj!}</w:t>
</w:r>
</w:p>
</#list>
</w:tc>
</w:tr>
</w:tbl>

2013
anrui-fin/anrui-fin-biz/src/main/resources/ftl/prePaymentApply1.ftl

File diff suppressed because it is too large

1209
anrui-fin/anrui-fin-biz/src/main/resources/ftl/新建 DOCX 文档.xml

File diff suppressed because it is too large

62
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowcc/SysFlowcc.java

@ -0,0 +1,62 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.portal.api.sysflowcc;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-portal(流程抄送) <br/>
* File: SysFlowcc.java <br/>
* Class: com.yxt.anrui.portal.api.sysflowcc.SysFlowcc <br/>
* Description: 流程抄送表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-11-10 14:05:14 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "流程抄送表", description = "流程抄送表")
@TableName("sys_flowcc")
public class SysFlowcc extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("流程key")
private String flowKey; // 流程key
@ApiModelProperty("流程名称")
private String flowName; // 流程名称
@ApiModelProperty("角色sid")
private String roleSid; // 角色sid
@ApiModelProperty("角色名称")
private String roleName; // 角色名称
}

69
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowcc/SysFlowccDetailsVo.java

@ -0,0 +1,69 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.portal.api.sysflowcc;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-portal(流程抄送) <br/>
* File: SysFlowccVo.java <br/>
* Class: com.yxt.anrui.portal.api.sysflowcc.SysFlowccVo <br/>
* Description: 流程抄送表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-11-10 14:05:14 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "流程抄送表 视图数据详情", description = "流程抄送表 视图数据详情")
public class SysFlowccDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("流程key")
private String flowKey; // 流程key
@ApiModelProperty("流程名称")
private String flowName; // 流程名称
@ApiModelProperty("角色sid")
private String roleSid; // 角色sid
@ApiModelProperty("角色名称")
private String roleName; // 角色名称
@ApiModelProperty("角色sid")
private List<String> roleSids; // 角色sid
@ApiModelProperty("角色名称")
private List<String> roleNames; // 角色名称
}

65
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowcc/SysFlowccDto.java

@ -0,0 +1,65 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.portal.api.sysflowcc;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-portal(流程抄送) <br/>
* File: SysFlowccDto.java <br/>
* Class: com.yxt.anrui.portal.api.sysflowcc.SysFlowccDto <br/>
* Description: 流程抄送表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-11-10 14:05:14 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "流程抄送表 数据传输对象", description = "流程抄送表 数据传输对象")
public class SysFlowccDto implements Dto {
private String sid; // sid
@ApiModelProperty("流程key")
private String flowKey; // 流程key
@ApiModelProperty("流程名称")
private String flowName; // 流程名称
@ApiModelProperty("角色sid")
private List<String> roleSids; // 角色sid
@ApiModelProperty("角色名称")
private List<String> roleNames; // 角色名称
}

78
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowcc/SysFlowccFeign.java

@ -0,0 +1,78 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.portal.api.sysflowcc;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: anrui-portal(流程抄送) <br/>
* File: SysFlowccFeign.java <br/>
* Class: com.yxt.anrui.portal.api.sysflowcc.SysFlowccFeign <br/>
* Description: 流程抄送表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-11-10 14:05:14 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "流程抄送表")
@FeignClient(
contextId = "anrui-portal-SysFlowcc",
name = "anrui-portal",
path = "v1/sysflowcc",
fallback = SysFlowccFeignFallback.class)
public interface SysFlowccFeign {
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
@ResponseBody
public ResultBean<PagerVo<SysFlowccVo>> listPage(@RequestBody PagerQuery<SysFlowccQuery> pq);
@ApiOperation("新增或修改")
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody SysFlowccDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<SysFlowccDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
}

72
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowcc/SysFlowccFeignFallback.java

@ -0,0 +1,72 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.portal.api.sysflowcc;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* Project: anrui-portal(流程抄送) <br/>
* File: SysFlowccFeignFallback.java <br/>
* Class: com.yxt.anrui.portal.api.sysflowcc.SysFlowccFeignFallback <br/>
* Description: 流程抄送表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-11-10 14:05:14 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class SysFlowccFeignFallback implements SysFlowccFeign {
@Override
public ResultBean<PagerVo<SysFlowccVo>> listPage(PagerQuery<SysFlowccQuery> pq){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-portal/sysflowcc/listPage无法访问");
}
@Override
public ResultBean save(SysFlowccDto dto){
return ResultBean.fireFail().setMsg("接口anrui-portal/sysflowcc/save无法访问");
}
@Override
public ResultBean delBySids( String[] sids){
return ResultBean.fireFail().setMsg("接口anrui-portal/sysflowcc/delBySids无法访问");
}
@Override
public ResultBean<SysFlowccDetailsVo> fetchDetailsBySid(String sid){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-portal/sysflowcc/fetchDetailsBySid无法访问");
}
}

54
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowcc/SysFlowccQuery.java

@ -0,0 +1,54 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.portal.api.sysflowcc;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-portal(流程抄送) <br/>
* File: SysFlowccQuery.java <br/>
* Class: com.yxt.anrui.portal.api.sysflowcc.SysFlowccQuery <br/>
* Description: 流程抄送表 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-11-10 14:05:14 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "流程抄送表 查询条件", description = "流程抄送表 查询条件")
public class SysFlowccQuery implements Query {
@ApiModelProperty("流程名称")
private String flowName; // 流程名称
}

63
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowcc/SysFlowccVo.java

@ -0,0 +1,63 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.portal.api.sysflowcc;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-portal(流程抄送) <br/>
* File: SysFlowccVo.java <br/>
* Class: com.yxt.anrui.portal.api.sysflowcc.SysFlowccVo <br/>
* Description: 流程抄送表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-11-10 14:05:14 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "流程抄送表 视图数据对象", description = "流程抄送表 视图数据对象")
public class SysFlowccVo implements Vo {
private String sid; // sid
@ApiModelProperty("流程key")
private String flowKey; // 流程key
@ApiModelProperty("流程名称")
private String flowName; // 流程名称
@ApiModelProperty("角色sid")
private String roleSid; // 角色sid
@ApiModelProperty("角色名称")
private String roleName; // 角色名称
}

71
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowcc/SysFlowccMapper.java

@ -0,0 +1,71 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.portal.biz.sysflowcc;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.portal.api.sysflowcc.SysFlowcc;
import com.yxt.anrui.portal.api.sysflowcc.SysFlowccVo;
import java.util.List;
/**
* Project: anrui-portal(流程抄送) <br/>
* File: SysFlowccMapper.java <br/>
* Class: com.yxt.anrui.portal.biz.sysflowcc.SysFlowccMapper <br/>
* Description: 流程抄送表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-11-10 14:05:14 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface SysFlowccMapper extends BaseMapper<SysFlowcc> {
//@Update("update sys_flowcc set name=#{msg} where id=#{id}")
//IPage<SysFlowccVo> voPage(IPage<SysFlowcc> page, @Param(Constants.WRAPPER) QueryWrapper<SysFlowcc> qw);
IPage<SysFlowccVo> selectPageVo(IPage<SysFlowcc> page, @Param(Constants.WRAPPER) Wrapper<SysFlowcc> qw);
List<SysFlowccVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SysFlowcc> qw);
@Select("select * from sys_flowcc")
List<SysFlowccVo> selectListVo();
@Select("select * from sys_flowcc where flowKey = #{flowKey}")
SysFlowccVo selectByFlowKey(String flowKey);
@Select("select * from sys_flowcc where flowKey = #{flowKey} and sid != #{sid}")
SysFlowccVo selectByFlowKeyAndSid(@Param("flowKey") String flowKey, @Param("sid") String sid);
}

13
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowcc/SysFlowccMapper.xml

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.portal.biz.sysflowcc.SysFlowccMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.portal.api.sysflowcc.SysFlowccVo">
SELECT * FROM sys_flowcc <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.portal.api.sysflowcc.SysFlowccVo">
SELECT * FROM sys_flowcc <where> ${ew.sqlSegment} </where>
</select>
</mapper>

105
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowcc/SysFlowccRest.java

@ -0,0 +1,105 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.portal.biz.sysflowcc;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.List;
import com.yxt.anrui.portal.api.sysflowcc.SysFlowcc;
import com.yxt.anrui.portal.api.sysflowcc.SysFlowccQuery;
import com.yxt.anrui.portal.api.sysflowcc.SysFlowccVo;
import com.yxt.anrui.portal.api.sysflowcc.SysFlowccDetailsVo;
import com.yxt.anrui.portal.api.sysflowcc.SysFlowccDto;
import com.yxt.anrui.portal.api.sysflowcc.SysFlowccFeign;
/**
* Project: anrui-portal(流程抄送) <br/>
* File: SysFlowccFeignFallback.java <br/>
* Class: com.yxt.anrui.portal.biz.sysflowcc.SysFlowccRest <br/>
* Description: 流程抄送表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-11-10 14:05:14 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "流程抄送表")
@RestController("com.yxt.anrui.portal.biz.sysflowcc.SysFlowccRest")
@RequestMapping("v1/sysflowcc")
public class SysFlowccRest implements SysFlowccFeign {
@Autowired
private SysFlowccService sysFlowccService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<SysFlowccVo>> listPage(@RequestBody PagerQuery<SysFlowccQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<SysFlowccVo> pv = sysFlowccService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody SysFlowccDto dto){
return sysFlowccService.saveOrUpdateDto(dto);
}
@Override
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
sysFlowccService.delBySids(sids);
return rb.success();
}
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<SysFlowccDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
SysFlowccDetailsVo vo = sysFlowccService.fetchDetailsVoBySid(sid);
String roleSid = vo.getRoleSid();
String roleName = vo.getRoleName();
String[] roleSids = roleSid.split("、");
String[] roleNames = roleName.split("、");
vo.setRoleSids(Arrays.asList(roleSids));
vo.setRoleNames(Arrays.asList(roleNames));
return rb.success().setData(vo);
}
}

150
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowcc/SysFlowccService.java

@ -0,0 +1,150 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.portal.biz.sysflowcc;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.R;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.anrui.portal.api.sysflowcc.SysFlowcc;
import com.yxt.anrui.portal.api.sysflowcc.SysFlowccQuery;
import com.yxt.anrui.portal.api.sysflowcc.SysFlowccVo;
import com.yxt.anrui.portal.api.sysflowcc.SysFlowccDetailsVo;
import com.yxt.anrui.portal.api.sysflowcc.SysFlowccDto;
import com.yxt.anrui.portal.api.sysflowcc.SysFlowccFeign;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Project: anrui-portal(流程抄送) <br/>
* File: SysFlowccService.java <br/>
* Class: com.yxt.anrui.portal.biz.sysflowcc.SysFlowccService <br/>
* Description: 流程抄送表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-11-10 14:05:14 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class SysFlowccService extends MybatisBaseService<SysFlowccMapper, SysFlowcc> {
private QueryWrapper<SysFlowcc> createQueryWrapper(SysFlowccQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<SysFlowcc> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<SysFlowccVo> listPageVo(PagerQuery<SysFlowccQuery> pq) {
SysFlowccQuery query = pq.getParams();
QueryWrapper<SysFlowcc> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getFlowName())) {
qw.like("flowName", query.getFlowName());
}
IPage<SysFlowcc> page = PagerUtil.queryToPage(pq);
IPage<SysFlowccVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<SysFlowccVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean saveOrUpdateDto(SysFlowccDto dto) {
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
List<String> roleSids = dto.getRoleSids();
List<String> roleNames = dto.getRoleNames();
StringBuilder roleSidPath = new StringBuilder();
StringBuilder roleNamePath = new StringBuilder();
if (roleSids.isEmpty()){
return rb.setMsg("请选择角色");
}
for (String roleSid : roleSids) {
roleSidPath.append(roleSid).append("、");
}
for (String roleName : roleNames) {
roleNamePath.append(roleName).append("、");
}
if (StringUtils.isBlank(dtoSid)) {
SysFlowccVo sysFlowccVo = baseMapper.selectByFlowKey(dto.getFlowKey());
if (sysFlowccVo != null){
return rb.setMsg("此流程已存在,请重新选择");
}
SysFlowcc sysFlowcc = new SysFlowcc();
sysFlowcc.setFlowKey(dto.getFlowKey());
sysFlowcc.setFlowName(dto.getFlowName());
sysFlowcc.setRoleSid(roleSidPath.substring(0,roleSidPath.lastIndexOf("、")));
sysFlowcc.setRoleName(roleNamePath.substring(0,roleNamePath.lastIndexOf("、")));
save(sysFlowcc);
return rb.success().setMsg("添加成功");
}
SysFlowcc sysFlowcc = fetchBySid(dtoSid);
if (sysFlowcc == null){
return rb.setMsg("流程抄送不存在");
}
SysFlowccVo sysFlowccVo = baseMapper.selectByFlowKeyAndSid(dto.getFlowKey(), dtoSid);
if (sysFlowccVo != null){
return rb.setMsg("此流程已存在,请重新选择");
}
sysFlowcc.setFlowKey(dto.getFlowKey());
sysFlowcc.setFlowName(dto.getFlowName());
sysFlowcc.setRoleSid(roleSidPath.substring(0,roleSidPath.lastIndexOf("、")));
sysFlowcc.setRoleName(roleNamePath.substring(0,roleNamePath.lastIndexOf("、")));
baseMapper.updateById(sysFlowcc);
return rb.success().setMsg("修改成功");
}
public void insertByDto(SysFlowccDto dto) {
SysFlowcc entity = new SysFlowcc();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(SysFlowccDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
SysFlowcc entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public SysFlowccDetailsVo fetchDetailsVoBySid(String sid) {
SysFlowcc entity = fetchBySid(sid);
SysFlowccDetailsVo vo = new SysFlowccDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
}
Loading…
Cancel
Save