geg-gas/geg-gas-pcitc
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

年度计划

Browse Source
This commit is contained in:
shunyi.kuang
2026-04-13 08:38:23 +08:00
parent 9942a07db7
commit c98efaddf9
16 changed files with 479 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
itc-pcitc-dependencies/itc-pcitc-dependencies-api/src/main/java/com/pictc/enums/ApproveCodeEnum.java
View File

@ -9,6 +9,7 @@ public enum ApproveCodeEnum {
WTJ("WTJ", "未提交"),
SPZ("SPZ", "审批中"),
YTJ("YTJ", "已提交"),
YSP("YSP", "已审批"),

2
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/UpdateLngPlanYearDemandHdrEcDto.java
View File

@ -104,6 +104,6 @@ public class UpdateLngPlanYearDemandHdrEcDto implements Serializable {
columns = {
@LogJoinColumn(field = "id",relatedField = "pydhId", valueDirection = ValueDirectionType.RIGHT)
},
caseType = JoinCaseType.FULL, target = UpdateLngPlanYearDemandDto.class, type = JoinType.MANY)
caseType = JoinCaseType.FULL, target = UpdateLngPlanYearDemandEcDto.class, type = JoinType.MANY)
private List<UpdateLngPlanYearDemandEcDto> lngPlanYearDemandList;
}

7
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandHdrVo.java
View File

@ -28,6 +28,13 @@ public class LngPlanYearDemandHdrVo extends com.xjrsoft.common.model.base.BaseMo
@ApiModelProperty("客户编码")
private String cuCode;
/**
* 客户编码
*/
@ApiModelProperty("客户名称")
private String cuName;
/**
* 年度

66
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/controller/PlanYearDemandHdrController.java
View File

@ -1,36 +1,41 @@
package com.xjrsoft.module.plan.controller;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import java.util.List;
import javax.validation.Valid;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.xjrsoft.common.constant.GlobalConstant;
import com.baomidou.mybatisplus.core.toolkit.StringPool;
import com.pictc.datalog.DataOperationContent;
import com.pictc.datalog.DataOperationListener;
import com.pictc.enums.ApproveCodeEnum;
import com.xjrsoft.common.model.result.R;
import com.xjrsoft.common.page.ConventPage;
import com.xjrsoft.common.page.PageOutput;
import com.xjrsoft.common.model.result.R;
import com.xjrsoft.common.utils.VoToColumnUtil;
import com.xjrsoft.module.plan.dto.AddLngPlanYearDemandHdrDto;
import com.xjrsoft.module.plan.dto.UpdateLngPlanYearDemandHdrDto;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.xjrsoft.module.datalog.service.DatalogService;
import com.xjrsoft.module.datalog.vo.DataChangeLogVo;
import com.xjrsoft.module.plan.dto.LngPlanYearDemandHdrPageDto;
import com.xjrsoft.module.plan.dto.UpdateLngPlanYearDemandHdrDto;
import com.xjrsoft.module.plan.entity.LngPlanYearDemandHdr;
import com.xjrsoft.module.plan.service.IPlanYearDemandHdrService;
import com.xjrsoft.module.plan.vo.LngPlanYearDemandHdrPageVo;
import com.xjrsoft.module.datalog.vo.DataChangeLogVo;
import com.xjrsoft.module.datalog.service.DatalogService;
import com.xjrsoft.module.plan.vo.LngPlanYearDemandHdrVo;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
* @title: 客户年度需求提报
@ -73,11 +78,11 @@ public class PlanYearDemandHdrController {
@ApiOperation(value="根据id查询LngPlanYearDemandHdr信息")
@SaCheckPermission("planYearDemandHdr:detail")
public R info(@RequestParam Long id){
LngPlanYearDemandHdr lngPlanYearDemandHdr = planYearDemandHdrService.getById(id);
LngPlanYearDemandHdrVo lngPlanYearDemandHdr = planYearDemandHdrService.getInfoById(id);
if (lngPlanYearDemandHdr == null) {
return R.error("找不到此数据！");
}
return R.ok(BeanUtil.toBean(lngPlanYearDemandHdr, LngPlanYearDemandHdrVo.class));
return R.ok(lngPlanYearDemandHdr);
}
@GetMapping(value = "/datalog")
@ -97,6 +102,27 @@ public class PlanYearDemandHdrController {
return R.ok(dataService.updateById(dto));
}
@PostMapping(value="/reject")
@ApiOperation(value = "驳回LngPlanYearDemandHdr")
//@SaCheckPermission("planYearDemandHdr:edit")
public R reject(@Valid @RequestBody UpdateLngPlanYearDemandHdrDto dto){
LngPlanYearDemandHdr lngPlanYearDemandHdr = planYearDemandHdrService.getById(dto.getId());
lngPlanYearDemandHdr.setApproCode(ApproveCodeEnum.YBH.getCode());
lngPlanYearDemandHdr.setReply(dto.getReply());
dataService.updateById(lngPlanYearDemandHdr,new DataOperationListener<LngPlanYearDemandHdr>() {
@Override
public LngPlanYearDemandHdr before(DataOperationContent<LngPlanYearDemandHdr> content) {
return null;
}
@Override
public LngPlanYearDemandHdr after(DataOperationContent<LngPlanYearDemandHdr> content) {
//callSubmit(dto,content);
return null;
}
});
return R.ok();
}
}

36
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/controller/PlanYearDemandHdrEcController.java
View File

@ -20,6 +20,9 @@ import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.support.ExcelTypeEnum;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.pictc.enums.ApproveCodeEnum;
import com.pictc.enums.BusinessCode;
import com.xjrsoft.common.exception.BusinessException;
import com.xjrsoft.common.model.result.R;
import com.xjrsoft.common.page.ConventPage;
import com.xjrsoft.common.page.PageOutput;
@ -33,11 +36,11 @@ import com.xjrsoft.module.plan.dto.UpdateLngPlanYearDemandHdrEcDto;
import com.xjrsoft.module.plan.entity.LngPlanYearDemandHdrEc;
import com.xjrsoft.module.plan.service.IPlanYearDemandHdrEcService;
import com.xjrsoft.module.plan.vo.LngPlanYearDemandHdrEcPageVo;
import com.xjrsoft.module.plan.vo.LngPlanYearDemandHdrEcVo;
import com.xjrsoft.module.plan.vo.LngPlanYearDemandHdrPageVo;
import com.xjrsoft.module.plan.vo.LngPlanYearDemandHdrVo;
import com.xjrsoft.module.plan.vo.LngPlanYearDemandVo;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import io.swagger.annotations.Api;
@ -84,11 +87,11 @@ public class PlanYearDemandHdrEcController {
@ApiOperation(value="根据id查询LngPlanYearDemandHdr信息")
@SaCheckPermission("planYearDemandHdrEc:detail")
public R info(@RequestParam Long id){
LngPlanYearDemandHdrEc lngPlanYearDemandHdr = planYearDemandHdrEcService.getById(id);
LngPlanYearDemandHdrEcVo lngPlanYearDemandHdr = planYearDemandHdrEcService.getInfoById(id);
if (lngPlanYearDemandHdr == null) {
return R.error("找不到此数据！");
}
return R.ok(BeanUtil.toBean(lngPlanYearDemandHdr, LngPlanYearDemandHdrVo.class));
return R.ok(lngPlanYearDemandHdr);
}
@GetMapping(value = "/datalog")
@ -115,6 +118,23 @@ public class PlanYearDemandHdrEcController {
return R.ok(dataService.updateById(dto));
}
@PostMapping(value = "/saveAndSubmit")
@ApiOperation(value = "保存并提交LngPlanYearDemandHdr")
// @SaCheckPermission("planYearDemandHdrEc:add")
public R saveAndSubmit(@Valid @RequestBody UpdateLngPlanYearDemandHdrEcDto dto){
planYearDemandHdrEcService.saveAndSubmit(dto);
return R.ok();
}
@PostMapping(value = "/save")
@ApiOperation(value = "保存并提交LngPlanYearDemandHdr")
// @SaCheckPermission("planYearDemandHdrEc:add")
public R save(@Valid @RequestBody UpdateLngPlanYearDemandHdrEcDto dto){
planYearDemandHdrEcService.save(dto);
return R.ok();
}
@DeleteMapping
@ApiOperation(value = "删除")
@SaCheckPermission("planYearDemandHdrEc:delete")
@ -124,6 +144,14 @@ public class PlanYearDemandHdrEcController {
}
@GetMapping(value="/toChange")
@ApiOperation(value = "变更planYearDemandHdrEc")
//@SaCheckPermission("demand:toChange")
public R toChange(@Valid @RequestParam Long id){
return R.ok(planYearDemandHdrEcService.toChange(id));
}
@GetMapping("/export")
@ApiOperation(value = "导出")
@SaCheckPermission("planYearDemandHdrEc:export")

40
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemand.java
View File

@ -1,21 +1,19 @@
package com.xjrsoft.module.plan.entity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.Version;
import com.github.yulichang.annotation.EntityMapping;
import com.baomidou.mybatisplus.annotation.TableName;
import com.pictc.annotations.datalog.LogTable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.List;
/**
@ -62,84 +60,84 @@ public class LngPlanYearDemand implements Serializable {
* 1月
*/
@ApiModelProperty("1月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
@TableField(value="qty_01",updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qty01;
/**
* 2月
*/
@ApiModelProperty("2月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
@TableField(value="qty_02",updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qty02;
/**
* 3月
*/
@ApiModelProperty("3月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
@TableField(value="qty_03",updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qty03;
/**
* 4月
*/
@ApiModelProperty("4月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
@TableField(value="qty_04",updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qty04;
/**
* 5月
*/
@ApiModelProperty("5月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
@TableField(value="qty_05",updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qty05;
/**
* 6月
*/
@ApiModelProperty("6月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
@TableField(value="qty_06",updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qty06;
/**
* 7月
*/
@ApiModelProperty("7月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
@TableField(value="qty_07",updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qty07;
/**
* 8月
*/
@ApiModelProperty("8月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
@TableField(value="qty_08",updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qty08;
/**
* 9月
*/
@ApiModelProperty("9月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
@TableField(value="qty_09",updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qty09;
/**
* 10月
*/
@ApiModelProperty("10月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
@TableField(value="qty_10",updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qty10;
/**
* 11月
*/
@ApiModelProperty("11月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
@TableField(value="qty_11",updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qty11;
/**
* 12月
*/
@ApiModelProperty("12月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
@TableField(value="qty_12",updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qty12;
/**

24
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemandEc.java
View File

@ -59,84 +59,84 @@ public class LngPlanYearDemandEc implements Serializable {
* 1月
*/
@ApiModelProperty("1月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
@TableField(value="qty_01",updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qty01;
/**
* 2月
*/
@ApiModelProperty("2月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
@TableField(value="qty_02",updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qty02;
/**
* 3月
*/
@ApiModelProperty("3月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
@TableField(value="qty_03",updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qty03;
/**
* 4月
*/
@ApiModelProperty("4月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
@TableField(value="qty_04",updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qty04;
/**
* 5月
*/
@ApiModelProperty("5月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
@TableField(value="qty_05",updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qty05;
/**
* 6月
*/
@ApiModelProperty("6月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
@TableField(value="qty_06",updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qty06;
/**
* 7月
*/
@ApiModelProperty("7月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
@TableField(value="qty_07",updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qty07;
/**
* 8月
*/
@ApiModelProperty("8月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
@TableField(value="qty_08",updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qty08;
/**
* 9月
*/
@ApiModelProperty("9月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
@TableField(value="qty_09",updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qty09;
/**
* 10月
*/
@ApiModelProperty("10月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
@TableField(value="qty_10",updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qty10;
/**
* 11月
*/
@ApiModelProperty("11月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
@TableField(value="qty_11",updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qty11;
/**
* 12月
*/
@ApiModelProperty("12月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
@TableField(value="qty_12",updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qty12;
/**

12
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemandHdr.java
View File

@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.pictc.annotations.datalog.LogField;
import com.pictc.annotations.datalog.LogTable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -22,6 +24,7 @@ import lombok.Data;
*/
@Data
@TableName("lng_plan_year_demand_hdr")
@LogTable(source="lng_plan_year_demand_hdr",name="客户年度需求提报")
@ApiModel(value = "客户年度需求提报对象", description = "客户年度需求提报")
public class LngPlanYearDemandHdr implements Serializable {
@ -32,6 +35,7 @@ public class LngPlanYearDemandHdr implements Serializable {
*/
@ApiModelProperty("主键")
@TableId
@LogField(name="主键",index=0)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Long id;
@ -39,12 +43,14 @@ public class LngPlanYearDemandHdr implements Serializable {
* 客户编码
*/
@ApiModelProperty("客户编码")
@LogField(name="客户编码",index=1)
private String cuCode;
/**
* 年度
*/
@ApiModelProperty("年度")
@LogField(name="年度",index=2)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Short planYear;
@ -52,6 +58,7 @@ public class LngPlanYearDemandHdr implements Serializable {
* 版本(自动生成，每客户每年从1开始)
*/
@ApiModelProperty("版本(自动生成，每客户每年从1开始)")
@LogField(name="版本(自动生成，每客户每年从1开始)",index=3)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Byte demandVerNo;
@ -59,24 +66,28 @@ public class LngPlanYearDemandHdr implements Serializable {
* 最新版(Y-是，N-否；每客户每年只有一个Y)
*/
@ApiModelProperty("最新版(Y-是，N-否；每客户每年只有一个Y)")
@LogField(name="最新版(Y-是，N-否；每客户每年只有一个Y)",index=4)
private String lastSign;
/**
* 审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回)
*/
@ApiModelProperty("审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回)")
@LogField(name="审批状态",index=5)
private String approCode;
/**
* 批复意见
*/
@ApiModelProperty("批复意见")
@LogField(name="批复意见",index=6)
private String reply;
/**
* 备注
*/
@ApiModelProperty("备注")
@LogField(name="备注",index=7)
private String note;
/**
@ -111,6 +122,7 @@ public class LngPlanYearDemandHdr implements Serializable {
* 租户id
*/
@ApiModelProperty("租户id")
@LogField(name="租户id",index=8)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Long tenantId;

28
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/mapper/LngPlanYearDemandEcMapper.java Normal file
View File

@ -0,0 +1,28 @@
package com.xjrsoft.module.plan.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.xjrsoft.module.plan.entity.LngPlanYearDemandEc;
import com.xjrsoft.module.plan.vo.LngPlanYearDemandEcVo;
/**
* @title: mapper
* @Author 管理员
* @Date: 2026-04-09
* @Version 1.0
*/
@Mapper
public interface LngPlanYearDemandEcMapper extends MPJBaseMapper<LngPlanYearDemandEc>,BaseMapper<LngPlanYearDemandEc> {
@Select("SELECT pyd.* "+
" FROM lng_plan_year_demand pyd" +
" WHERE pyd.pydh_id = #{pydhId}")
List<LngPlanYearDemandEcVo> queryLngPlanYearDemandEcList(@Param("pydhId") Long pydhId);
}

9
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/mapper/LngPlanYearDemandHdrEcMapper.java
View File

@ -1,9 +1,13 @@
package com.xjrsoft.module.plan.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xjrsoft.module.plan.entity.LngPlanYearDemandHdrEc;
import com.xjrsoft.module.plan.vo.LngPlanYearDemandHdrEcVo;
import com.xjrsoft.module.plan.vo.LngPlanYearDemandHdrVo;
/**
* @title: mapper
@ -14,4 +18,9 @@ import com.xjrsoft.module.plan.entity.LngPlanYearDemandHdrEc;
@Mapper
public interface LngPlanYearDemandHdrEcMapper extends BaseMapper<LngPlanYearDemandHdrEc> {
@Select("SELECT dh.*,cu.cu_sname AS cu_name"+
" FROM lng_plan_year_demand_hdr dh" +
" LEFT JOIN lng_customer cu ON cu.cu_code=dh.cu_code"+
" WHERE dh.id = #{id}")
LngPlanYearDemandHdrEcVo queryLngPlanYearDemandHdrEcById(@Param("id") Long id);
}

16
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/mapper/LngPlanYearDemandHdrMapper.java
View File

@ -1,9 +1,12 @@
package com.xjrsoft.module.plan.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.xjrsoft.module.plan.entity.LngPlanYearDemandHdr;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xjrsoft.module.plan.entity.LngPlanYearDemandHdr;
import com.xjrsoft.module.plan.vo.LngPlanYearDemandHdrVo;
/**
* @title: mapper
@ -14,4 +17,11 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface LngPlanYearDemandHdrMapper extends BaseMapper<LngPlanYearDemandHdr> {
@Select("SELECT dh.*,cu.cu_sname AS cu_name"+
" FROM lng_plan_year_demand_hdr dh" +
" LEFT JOIN lng_customer cu ON cu.cu_code=dh.cu_code"+
" WHERE dh.id = #{id}")
LngPlanYearDemandHdrVo queryLngPlanYearDemandHdrById(@Param("id") Long id);
}

14
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/mapper/LngPlanYearDemandMapper.java
View File

@ -1,9 +1,15 @@
package com.xjrsoft.module.plan.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.xjrsoft.module.plan.entity.LngPlanYearDemand;
import org.apache.ibatis.annotations.Mapper;
import com.xjrsoft.module.plan.vo.LngPlanYearDemandVo;
/**
* @title: mapper
@ -12,6 +18,10 @@ import org.apache.ibatis.annotations.Mapper;
* @Version 1.0
*/
@Mapper
public interface LngPlanYearDemandMapper extends MPJBaseMapper<LngPlanYearDemand> {
public interface LngPlanYearDemandMapper extends MPJBaseMapper<LngPlanYearDemand>,BaseMapper<LngPlanYearDemand> {
@Select("SELECT pyd.* "+
" FROM lng_plan_year_demand pyd" +
" WHERE pyd.pydh_id = #{pydhId}")
List<LngPlanYearDemandVo> queryLngPlanYearDemandList(@Param("pydhId") Long pydhId);
}

12
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/service/IPlanYearDemandHdrEcService.java
View File

@ -1,7 +1,11 @@
package com.xjrsoft.module.plan.service;
import javax.validation.Valid;
import com.baomidou.mybatisplus.extension.service.IService;
import com.xjrsoft.module.plan.dto.UpdateLngPlanYearDemandHdrEcDto;
import com.xjrsoft.module.plan.entity.LngPlanYearDemandHdrEc;
import com.xjrsoft.module.plan.vo.LngPlanYearDemandHdrEcVo;
/**
* @title: service
@ -11,4 +15,12 @@ import com.xjrsoft.module.plan.entity.LngPlanYearDemandHdrEc;
*/
public interface IPlanYearDemandHdrEcService extends IService<LngPlanYearDemandHdrEc> {
LngPlanYearDemandHdrEcVo getInfoById(Long id);
void saveAndSubmit(@Valid UpdateLngPlanYearDemandHdrEcDto dto);
void save(@Valid UpdateLngPlanYearDemandHdrEcDto dto);
LngPlanYearDemandHdrEcVo toChange(@Valid Long id);
}

4
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/service/IPlanYearDemandHdrService.java
View File

@ -5,6 +5,8 @@ import com.github.yulichang.base.MPJBaseService;
import com.github.yulichang.extension.mapping.base.MPJDeepService;
import com.github.yulichang.extension.mapping.base.MPJRelationService;
import com.xjrsoft.module.plan.entity.LngPlanYearDemandHdr;
import com.xjrsoft.module.plan.vo.LngPlanYearDemandHdrVo;
import lombok.Data;
import java.util.List;
@ -16,4 +18,6 @@ import java.util.List;
*/
public interface IPlanYearDemandHdrService extends IService<LngPlanYearDemandHdr> {
LngPlanYearDemandHdrVo getInfoById(Long id);
}

175
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/service/impl/PlanYearDemandHdrEcServiceImpl.java
View File

@ -1,13 +1,31 @@
package com.xjrsoft.module.plan.service.impl;
import java.util.List;
import javax.validation.Valid;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pictc.datalog.DataOperationContent;
import com.pictc.datalog.DataOperationListener;
import com.pictc.enums.ApproveCodeEnum;
import com.pictc.enums.BusinessCode;
import com.xjrsoft.common.exception.BusinessException;
import com.xjrsoft.module.datalog.service.DatalogService;
import com.xjrsoft.module.plan.dto.UpdateLngPlanYearDemandHdrEcDto;
import com.xjrsoft.module.plan.entity.LngPlanYearDemandHdrEc;
import com.xjrsoft.module.plan.mapper.LngPlanYearDemandEcMapper;
import com.xjrsoft.module.plan.mapper.LngPlanYearDemandHdrEcMapper;
import com.xjrsoft.module.plan.service.IPlanYearDemandHdrEcService;
import com.xjrsoft.module.plan.vo.LngPlanYearDemandEcVo;
import com.xjrsoft.module.plan.vo.LngPlanYearDemandHdrEcVo;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import lombok.AllArgsConstructor;
import shade.powerjob.com.google.common.collect.Lists;
/**
* @title: service
@ -18,4 +36,161 @@ import lombok.AllArgsConstructor;
@Service
@AllArgsConstructor
public class PlanYearDemandHdrEcServiceImpl extends ServiceImpl<LngPlanYearDemandHdrEcMapper, LngPlanYearDemandHdrEc> implements IPlanYearDemandHdrEcService {
private final LngPlanYearDemandHdrEcMapper lngPlanYearDemandHdrEcMapper;
private final LngPlanYearDemandEcMapper lngPlanYearDemandEcMapper;
private final DatalogService dataService;
@Override
public LngPlanYearDemandHdrEcVo getInfoById(Long id) {
LngPlanYearDemandHdrEcVo vo = lngPlanYearDemandHdrEcMapper.queryLngPlanYearDemandHdrEcById(id);
List<LngPlanYearDemandEcVo> deVoList = lngPlanYearDemandEcMapper.queryLngPlanYearDemandEcList(id);
vo.setLngPlanYearDemandList(deVoList);
return vo;
}
@Override
public void saveAndSubmit(@Valid UpdateLngPlanYearDemandHdrEcDto dto) {
dto.setApproCode(ApproveCodeEnum.YTJ.getCode());
if(StrUtil.isBlank(dto.getCuCode())) {
throw new BusinessException(BusinessCode.of(10500,"客户编码不能为空"));
}
if(!checkIfCanSave(dto.getCuCode(),dto.getId())) {
throw new BusinessException(BusinessCode.of(10500,"存在未提交或已驳回的需求，不可保存数据"));
}
if(dto.getId() != null) {
LngPlanYearDemandHdrEc demand = this.getById(dto.getId());
if (demand == null) {
throw new BusinessException(BusinessCode.of(10500,"找不到此数据！"));
}
dataService.updateById(dto,new DataOperationListener<UpdateLngPlanYearDemandHdrEcDto>() {
@Override
public UpdateLngPlanYearDemandHdrEcDto before(DataOperationContent<UpdateLngPlanYearDemandHdrEcDto> content) {
return null;
}
@Override
public UpdateLngPlanYearDemandHdrEcDto after(DataOperationContent<UpdateLngPlanYearDemandHdrEcDto> content) {
//callSubmit(dto,content);
return null;
}
});
}else {
dto.setId(IdUtil.getSnowflakeNextId());
dataService.insert(dto,new DataOperationListener<UpdateLngPlanYearDemandHdrEcDto>() {
@Override
public UpdateLngPlanYearDemandHdrEcDto before(DataOperationContent<UpdateLngPlanYearDemandHdrEcDto> content) {
return null;
}
@Override
public UpdateLngPlanYearDemandHdrEcDto after(DataOperationContent<UpdateLngPlanYearDemandHdrEcDto> content) {
//callSubmit(dto,content);
return null;
}
});
}
}
@Override
public void save(@Valid UpdateLngPlanYearDemandHdrEcDto dto) {
dto.setApproCode(ApproveCodeEnum.WTJ.getCode());
if(dto.getDemandVerNo() == null) {
dto.setDemandVerNo((byte) 1);
}
if(StrUtil.isBlank(dto.getCuCode())) {
throw new BusinessException(BusinessCode.of(10500,"客户编码不能为空"));
}
if(!checkIfCanSave(dto.getCuCode(),dto.getId())) {
throw new BusinessException(BusinessCode.of(10500,"存在未提交或已驳回的需求，不可保存数据"));
}
if(dto.getId() != null) {
LngPlanYearDemandHdrEc lngPngDemand = this.getById(dto.getId());
if (lngPngDemand == null) {
throw new BusinessException(BusinessCode.of(10500,"找不到此数据！"));
}
dataService.updateById(dto,new DataOperationListener<UpdateLngPlanYearDemandHdrEcDto>() {
@Override
public UpdateLngPlanYearDemandHdrEcDto before(DataOperationContent<UpdateLngPlanYearDemandHdrEcDto> content) {
return null;
}
@Override
public UpdateLngPlanYearDemandHdrEcDto after(DataOperationContent<UpdateLngPlanYearDemandHdrEcDto> content) {
//callSubmit(dto,content);
return null;
}
});
}else {
dto.setId(IdUtil.getSnowflakeNextId());
dataService.insert(dto,new DataOperationListener<UpdateLngPlanYearDemandHdrEcDto>() {
@Override
public UpdateLngPlanYearDemandHdrEcDto before(DataOperationContent<UpdateLngPlanYearDemandHdrEcDto> content) {
return null;
}
@Override
public UpdateLngPlanYearDemandHdrEcDto after(DataOperationContent<UpdateLngPlanYearDemandHdrEcDto> content) {
//callSubmit(dto,content);
return null;
}
});
}
}
@Override
public LngPlanYearDemandHdrEcVo toChange(@Valid Long id) {
LngPlanYearDemandHdrEcVo res = this.getInfoById(id);
if (res == null) {
throw new BusinessException(BusinessCode.of(10500,"找不到此数据！"));
}
res.setId(null);
res.setDemandVerNo((byte) (res.getDemandVerNo()+(byte)1));
res.setLastSign("Y");
res.setApproCode(ApproveCodeEnum.WTJ.getCode());
res.setLastSign("Y");
if(res.getLngPlanYearDemandList() != null) {
for(LngPlanYearDemandEcVo pdp: res.getLngPlanYearDemandList()) {
pdp.setId(null);
}
}
return res;
}
private Boolean checkIfCanSave(String cuCode,Long id){
LambdaQueryWrapper<LngPlanYearDemandHdrEc> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(LngPlanYearDemandHdrEc::getCuCode, cuCode);
if(id != null) {
queryWrapper.ne(LngPlanYearDemandHdrEc::getId, id);
}
List<String> approCodeList = Lists.newArrayList();
approCodeList.add(ApproveCodeEnum.WTJ.getCode());
approCodeList.add(ApproveCodeEnum.YBH.getCode());
queryWrapper.in(LngPlanYearDemandHdrEc::getApproCode, approCodeList);
Long count = lngPlanYearDemandHdrEcMapper.selectCount(queryWrapper);
return count>0?false:true;
}
}

29
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/service/impl/PlanYearDemandHdrServiceImpl.java
View File

@ -1,17 +1,18 @@
package com.xjrsoft.module.plan.service.impl;
import java.util.List;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.xjrsoft.module.plan.entity.LngPlanYearDemandHdr;
import com.xjrsoft.module.plan.mapper.LngPlanYearDemandHdrMapper;
import com.xjrsoft.module.plan.mapper.LngPlanYearDemandMapper;
import com.xjrsoft.module.plan.service.IPlanYearDemandHdrService;
import com.xjrsoft.module.plan.vo.LngPlanYearDemandHdrVo;
import com.xjrsoft.module.plan.vo.LngPlanYearDemandVo;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
/**
* @title: service
@ -22,4 +23,18 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@Service
@AllArgsConstructor
public class PlanYearDemandHdrServiceImpl extends ServiceImpl<LngPlanYearDemandHdrMapper, LngPlanYearDemandHdr> implements IPlanYearDemandHdrService {
private LngPlanYearDemandHdrMapper lngPlanYearDemandHdrMapper;
private LngPlanYearDemandMapper lngPlanYearDemandMapper;
@Override
public LngPlanYearDemandHdrVo getInfoById(Long id) {
LngPlanYearDemandHdrVo vo = lngPlanYearDemandHdrMapper.queryLngPlanYearDemandHdrById(id);
List<LngPlanYearDemandVo> deVoList = lngPlanYearDemandMapper.queryLngPlanYearDemandList(id);
vo.setLngPlanYearDemandList(deVoList);
return vo;
}
}