1. 项目,合同,审核,回款
This commit is contained in:
parent
7113f5c1ca
commit
e649cb1782
|
|
@ -11,20 +11,7 @@
|
|||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.chushang</groupId>
|
||||
<artifactId>chushang-common-feign</artifactId>
|
||||
</dependency>
|
||||
<!-- 权限控制 -->
|
||||
<dependency>
|
||||
<groupId>com.chushang</groupId>
|
||||
<artifactId>chushang-common-data-scope</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.chushang</groupId>
|
||||
<artifactId>chushang-common-dict</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.chushang</groupId>
|
||||
<artifactId>chushang-common-log</artifactId>
|
||||
<artifactId>task-feign</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,36 @@
|
|||
package com.chushang.inspection.project.entity.dto;
|
||||
|
||||
import com.chushang.common.core.validator.Create;
|
||||
import com.chushang.common.core.validator.Update;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
/**
|
||||
* @auther: zhao
|
||||
* @date: 2024/6/15 14:23
|
||||
*/
|
||||
@Data
|
||||
public class ProjectDTO {
|
||||
/**
|
||||
* 项目名称
|
||||
*/
|
||||
@NotNull(message = "项目名称不能为空", groups = Create.class)
|
||||
@NotNull(message = "项目名称不能为空", groups = Update.class)
|
||||
private String projectName;
|
||||
|
||||
/**
|
||||
* 项目联系人
|
||||
*/
|
||||
private String projectConcat;
|
||||
|
||||
/**
|
||||
* 项目联系人电话
|
||||
*/
|
||||
private String projectPhone;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,98 @@
|
|||
package com.chushang.inspection.project.entity.po;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.chushang.common.mybatis.base.BaseEntity;
|
||||
import java.util.Date;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* @auther: zhao
|
||||
* @date: 2024/6/15 10:51
|
||||
*/
|
||||
/**
|
||||
* 审核记录表
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper=true)
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@TableName(value = "wrk_audit")
|
||||
public class WrkAudit extends BaseEntity {
|
||||
/**
|
||||
* 编号
|
||||
*/
|
||||
@TableId(value = "audit_id", type = IdType.ASSIGN_ID)
|
||||
private Long auditId;
|
||||
|
||||
/**
|
||||
* 三方id
|
||||
*/
|
||||
@TableField(value = "third_id")
|
||||
private Long thirdId;
|
||||
|
||||
/**
|
||||
* 审核状态
|
||||
*/
|
||||
@TableField(value = "audit_status")
|
||||
private Short auditStatus;
|
||||
|
||||
/**
|
||||
* 审核类型 0 项目, 1 合同, 2 其他(待补充)
|
||||
*/
|
||||
@TableField(value = "third_type")
|
||||
private Short thirdType;
|
||||
|
||||
/**
|
||||
* 审核时间 timestamp
|
||||
*/
|
||||
@TableField(value = "audit_time")
|
||||
private Date auditTime;
|
||||
|
||||
/**
|
||||
* 审核人 当前审核用户Id
|
||||
*/
|
||||
@TableField(value = "audit_user_id")
|
||||
private Long auditUserId;
|
||||
|
||||
/**
|
||||
* 审核人名称
|
||||
*/
|
||||
@TableField(value = "audit_name")
|
||||
private String auditName;
|
||||
|
||||
/**
|
||||
* 下级审核人 下级审核人
|
||||
*/
|
||||
@TableField(value = "sub_audit_user_id")
|
||||
private Long subAuditUserId;
|
||||
|
||||
/**
|
||||
* 下级审核人名称
|
||||
*/
|
||||
@TableField(value = "sub_audit_name")
|
||||
private String subAuditName;
|
||||
|
||||
/**
|
||||
* 备注 审核通过以及审核驳回结果都在此存储,
|
||||
*/
|
||||
@TableField(value = "remark")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 创建人 存储用户user_id
|
||||
*/
|
||||
@TableField(value = "create_by")
|
||||
private String createBy;
|
||||
|
||||
/**
|
||||
* 修改人 存储用户user_id
|
||||
*/
|
||||
@TableField(value = "update_by")
|
||||
private String updateBy;
|
||||
}
|
||||
|
|
@ -0,0 +1,88 @@
|
|||
package com.chushang.inspection.project.entity.po;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.chushang.common.mybatis.annotation.Condition;
|
||||
import com.chushang.common.mybatis.base.BaseEntity;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* @auther: zhao
|
||||
* @date: 2024/6/15 10:51
|
||||
*/
|
||||
/**
|
||||
* 项目表
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper=true)
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@TableName(value = "wrk_project")
|
||||
public class WrkProject extends BaseEntity {
|
||||
/**
|
||||
* 项目id
|
||||
*/
|
||||
@TableId(value = "project_id", type = IdType.ASSIGN_ID)
|
||||
@Condition(name = "project_id", type = Condition.ConditionType.eq)
|
||||
private Long projectId;
|
||||
|
||||
/**
|
||||
* 项目名称
|
||||
*/
|
||||
@TableField(value = "project_name")
|
||||
@Condition(name = "project_name", type = Condition.ConditionType.like)
|
||||
private String projectName;
|
||||
|
||||
/**
|
||||
* 项目联系人
|
||||
*/
|
||||
@TableField(value = "project_concat")
|
||||
@Condition(name = "project_concat", type = Condition.ConditionType.like)
|
||||
private String projectConcat;
|
||||
|
||||
/**
|
||||
* 项目联系人电话
|
||||
*/
|
||||
@TableField(value = "project_phone")
|
||||
@Condition(name = "project_phone", type = Condition.ConditionType.eq)
|
||||
private String projectPhone;
|
||||
|
||||
/**
|
||||
* 项目所属部门id
|
||||
*/
|
||||
@TableField(value = "dept_id")
|
||||
@Condition(name = "dept_id", type = Condition.ConditionType.eq)
|
||||
private Long deptId;
|
||||
|
||||
/**
|
||||
* 审核状态 项目审核状态 待初审 待复审 初审驳回 复审驳回 初审通过=待复审 复审通过
|
||||
*/
|
||||
@TableField(value = "audit_status")
|
||||
@Condition(name = "audit_status", type = Condition.ConditionType.eq)
|
||||
private Integer auditStatus;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@TableField(value = "remark")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 创建人 存储用户user_id
|
||||
*/
|
||||
@TableField(value = "create_by")
|
||||
@Condition(name = "create_by", type = Condition.ConditionType.eq)
|
||||
private String createBy;
|
||||
|
||||
/**
|
||||
* 修改人 存储用户user_id
|
||||
*/
|
||||
@TableField(value = "update_by")
|
||||
@Condition(name = "update_by", type = Condition.ConditionType.eq)
|
||||
private String updateBy;
|
||||
}
|
||||
|
|
@ -0,0 +1,99 @@
|
|||
package com.chushang.inspection.project.entity.po;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.chushang.common.mybatis.base.BaseEntity;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* @auther: zhao
|
||||
* @date: 2024/6/15 10:51
|
||||
*/
|
||||
/**
|
||||
* 项目合同表
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper=true)
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@TableName(value = "wrk_project_contract")
|
||||
public class WrkProjectContract extends BaseEntity {
|
||||
/**
|
||||
* 合同Id 合同主键id, 雪花自增
|
||||
*/
|
||||
@TableId(value = "contract_id", type = IdType.ASSIGN_ID)
|
||||
private Long contractId;
|
||||
|
||||
/**
|
||||
* 项目id 项目id, 1个项目id 对应多个合同id
|
||||
*/
|
||||
@TableField(value = "project_id")
|
||||
private Long projectId;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@TableField(value = "remark")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 项目合同 url
|
||||
*/
|
||||
@TableField(value = "contract_url")
|
||||
private String contractUrl;
|
||||
|
||||
/**
|
||||
* 合同有效期开始时间
|
||||
*/
|
||||
@TableField(value = "contract_start_time")
|
||||
private Date contractStartTime;
|
||||
|
||||
/**
|
||||
* 合同有效期结束日期
|
||||
*/
|
||||
@TableField(value = "contract_end_time")
|
||||
private Date contractEndTime;
|
||||
|
||||
/**
|
||||
* 合同金额 合同金额数, 后台存储采用decimal(20,5)
|
||||
*/
|
||||
@TableField(value = "contract_amount")
|
||||
private BigDecimal contractAmount;
|
||||
|
||||
/**
|
||||
* 审核状态 smallInt(6) 合同审核状态
|
||||
*/
|
||||
@TableField(value = "audit_status")
|
||||
private Short auditStatus;
|
||||
|
||||
/**
|
||||
* 项目有效状态 合同有效期内的项目为有效项目
|
||||
*/
|
||||
@TableField(value = "project_effect")
|
||||
private Short projectEffect;
|
||||
|
||||
/**
|
||||
* 回款状态 是否已经回款完成
|
||||
*/
|
||||
@TableField(value = "payment_state")
|
||||
private Short paymentState;
|
||||
|
||||
/**
|
||||
* 创建人 存储用户user_id
|
||||
*/
|
||||
@TableField(value = "create_by")
|
||||
private String createBy;
|
||||
|
||||
/**
|
||||
* 修改人 存储用户user_id
|
||||
*/
|
||||
@TableField(value = "update_by")
|
||||
private String updateBy;
|
||||
}
|
||||
|
|
@ -0,0 +1,97 @@
|
|||
package com.chushang.inspection.project.entity.po;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.chushang.common.mybatis.base.BaseEntity;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* @auther: zhao
|
||||
* @date: 2024/6/15 10:51
|
||||
*/
|
||||
/**
|
||||
* 项目回款记录表
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper=true)
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@TableName(value = "wrk_project_payment")
|
||||
public class WrkProjectPayment extends BaseEntity {
|
||||
/**
|
||||
* 回款id
|
||||
*/
|
||||
@TableField(value = "payment_id")
|
||||
private Long paymentId;
|
||||
|
||||
/**
|
||||
* 项目id
|
||||
*/
|
||||
@TableField(value = "project_id")
|
||||
private Long projectId;
|
||||
|
||||
/**
|
||||
* 回款合同id
|
||||
*/
|
||||
@TableField(value = "contracty_id")
|
||||
private Long contractyId;
|
||||
|
||||
/**
|
||||
* 项目名称
|
||||
*/
|
||||
@TableField(value = "project_name")
|
||||
private String projectName;
|
||||
|
||||
/**
|
||||
* 所属部门id
|
||||
*/
|
||||
@TableField(value = "dept_id")
|
||||
private Long deptId;
|
||||
|
||||
/**
|
||||
* 回款金额
|
||||
*/
|
||||
@TableField(value = "payment_amount")
|
||||
private BigDecimal paymentAmount;
|
||||
|
||||
/**
|
||||
* 回款证明
|
||||
*/
|
||||
@TableField(value = "payment_receipt")
|
||||
private String paymentReceipt;
|
||||
|
||||
/**
|
||||
* 回款日期
|
||||
*/
|
||||
@TableField(value = "payment_date")
|
||||
private String paymentDate;
|
||||
|
||||
/**
|
||||
* 回款月份
|
||||
*/
|
||||
@TableField(value = "payment_month")
|
||||
private String paymentMonth;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@TableField(value = "remark")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 创建人 存储用户user_id
|
||||
*/
|
||||
@TableField(value = "create_by")
|
||||
private String createBy;
|
||||
|
||||
/**
|
||||
* 修改人 存储用户user_id
|
||||
*/
|
||||
@TableField(value = "update_by")
|
||||
private String updateBy;
|
||||
}
|
||||
|
|
@ -46,7 +46,7 @@
|
|||
<!-- jar包不包含唯一版本标识 -->
|
||||
<useUniqueVersions>false</useUniqueVersions>
|
||||
<!--指定入口类 -->
|
||||
<mainClass>com.chushang.LoanApplication</mainClass>
|
||||
<mainClass>com.chushang.InspectionApplication</mainClass>
|
||||
</manifest>
|
||||
<manifestEntries>
|
||||
<!--MANIFEST.MF 中 Class-Path 加入资源文件目录 -->
|
||||
|
|
|
|||
|
|
@ -0,0 +1,102 @@
|
|||
package com.chushang.inspection.consumer;
|
||||
|
||||
import com.chushang.common.core.constant.SecurityConstants;
|
||||
import com.chushang.common.core.constant.ServiceConstant;
|
||||
import com.chushang.common.core.web.AjaxResult;
|
||||
import com.chushang.common.core.web.Result;
|
||||
import com.chushang.task.entity.TaskInfo;
|
||||
import com.chushang.task.entity.dto.UpdateTaskDTO;
|
||||
import com.chushang.task.enums.TaskStatusEnum;
|
||||
import com.chushang.task.enums.TaskTypeEnum;
|
||||
import com.chushang.task.feign.RemoteTaskService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
|
||||
import org.apache.rocketmq.spring.core.RocketMQListener;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.lang.reflect.Constructor;
|
||||
import java.lang.reflect.Method;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* @auther: zhao
|
||||
* @date: 2024/6/12 16:59
|
||||
*/
|
||||
@Slf4j
|
||||
@Component
|
||||
@RocketMQMessageListener(topic = ServiceConstant.SYSTEM, consumerGroup = ServiceConstant.SYSTEM_CONSUMER_GROUP)
|
||||
public class InspectionConsumerService implements RocketMQListener<TaskInfo> {
|
||||
@Resource
|
||||
RemoteTaskService remoteTaskService;
|
||||
/**
|
||||
* 执行 下发的 后台任务
|
||||
*/
|
||||
@Override
|
||||
public void onMessage(TaskInfo message) {
|
||||
remoteTaskService.updateTask(message.getTaskId(), UpdateTaskDTO.builder()
|
||||
.taskStatus(TaskStatusEnum.EXECUTING)
|
||||
.build(), SecurityConstants.INNER);
|
||||
// 通过 反射 去执行具体方法
|
||||
String className = message.getClassName();
|
||||
String methodName = message.getMethodName();
|
||||
String params = message.getParams();
|
||||
Integer taskType = message.getTaskType();
|
||||
UpdateTaskDTO updateTask = new UpdateTaskDTO();
|
||||
try {
|
||||
// 包名+类名
|
||||
Class classzz = Class.forName(className);
|
||||
// 获取构造器对象
|
||||
Constructor constructor = classzz.getConstructor();
|
||||
// 利用构造器对象创建一个对象
|
||||
Object o = constructor.newInstance();
|
||||
// 传递需要执行的方法
|
||||
Method method = classzz.getMethod(methodName, String.class);
|
||||
// 调用的方法有多个参数 Method method = classzz.getMethod("class1method",long.class,String.class,String.class);
|
||||
// 如果调用的方法有参数 invoke(o,param1,param2,param3,...)
|
||||
updateTask.setLastRunTime(LocalDateTime.now());
|
||||
Object invoke = method.invoke(o, params);
|
||||
if (invoke instanceof AjaxResult result){
|
||||
Integer code = (Integer) result.get(AjaxResult.DATA_TAG);
|
||||
if (result.isSuccess() && 200 == code){
|
||||
updateTask.setTaskStatus(TaskStatusEnum.EXECUTE_SUCCESS);
|
||||
String data = (String)result.get(AjaxResult.DATA_TAG);
|
||||
updateTask.setLastRunResult("success");
|
||||
if (Objects.equals(taskType, TaskTypeEnum.DOWN.getCode())){
|
||||
updateTask.setRemark(data);
|
||||
}
|
||||
}else {
|
||||
String errMsg = (String)result.get(AjaxResult.MSG_TAG);
|
||||
updateTask.setTaskStatus(TaskStatusEnum.EXECUTE_FAIL);
|
||||
updateTask.setLastRunResult(errMsg);
|
||||
}
|
||||
}else if (invoke instanceof Result<?> result){
|
||||
if (result.isSuccess() && result.getCode() == 200){
|
||||
updateTask.setTaskStatus(TaskStatusEnum.EXECUTE_SUCCESS);
|
||||
String data = (String)result.getData();
|
||||
updateTask.setLastRunResult("success");
|
||||
if (Objects.equals(taskType, TaskTypeEnum.DOWN.getCode())){
|
||||
updateTask.setRemark(data);
|
||||
}
|
||||
}else {
|
||||
String errMsg = result.getMsg();
|
||||
updateTask.setTaskStatus(TaskStatusEnum.EXECUTE_FAIL);
|
||||
updateTask.setLastRunResult(errMsg);
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception e){
|
||||
log.error("执行失败", e);
|
||||
updateTask.setTaskStatus(TaskStatusEnum.EXECUTE_FAIL);
|
||||
StringBuilder stringBuilder = new StringBuilder();
|
||||
stringBuilder.append(e).append("\n");
|
||||
for (StackTraceElement s : e.getStackTrace()) {
|
||||
stringBuilder.append(s.toString()).append("\n");
|
||||
}
|
||||
updateTask.setLastRunResult(stringBuilder.toString());
|
||||
}
|
||||
// 执行完毕后 更新 任务状态
|
||||
remoteTaskService.updateTask(message.getTaskId(), updateTask, SecurityConstants.INNER);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
package com.chushang.inspection.project.controller;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
/**
|
||||
* @auther: zhao
|
||||
* @date: 2024/6/15 11:21
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequestMapping(value = "/project/audit")
|
||||
public class WrkAuditController {
|
||||
}
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
package com.chushang.inspection.project.controller;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
/**
|
||||
* @auther: zhao
|
||||
* @date: 2024/6/15 11:22
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequestMapping(value = "/project/contract")
|
||||
public class WrkProjectContractController {
|
||||
}
|
||||
|
|
@ -0,0 +1,82 @@
|
|||
package com.chushang.inspection.project.controller;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import com.chushang.common.core.validator.Create;
|
||||
import com.chushang.common.core.web.AjaxResult;
|
||||
import com.chushang.common.log.annotation.SysLog;
|
||||
import com.chushang.common.log.enums.BusinessType;
|
||||
import com.chushang.common.mybatis.page.CommonParam;
|
||||
import com.chushang.common.mybatis.utils.PageResult;
|
||||
import com.chushang.inspection.project.entity.dto.ProjectDTO;
|
||||
import com.chushang.inspection.project.entity.po.WrkProject;
|
||||
import com.chushang.inspection.project.service.WrkProjectService;
|
||||
import com.chushang.security.annotation.RequiresPermissions;
|
||||
import com.chushang.security.entity.vo.LoginUser;
|
||||
import com.chushang.security.utils.SecurityUtils;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @auther: zhao
|
||||
* @date: 2024/6/15 11:22
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequestMapping(value = "/project")
|
||||
public class WrkProjectController {
|
||||
|
||||
@Resource
|
||||
WrkProjectService projectService;
|
||||
|
||||
/**
|
||||
* 获取项目列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
@RequiresPermissions("inspection:project:list")
|
||||
public AjaxResult list(WrkProject project)
|
||||
{
|
||||
CommonParam commonParam = CommonParam.buildPageRequest();
|
||||
PageResult pageResult = projectService.pageList(project, commonParam);
|
||||
return AjaxResult.success(pageResult);
|
||||
}
|
||||
|
||||
@PostMapping(value = "/save")
|
||||
@RequiresPermissions("inspection:project:save")
|
||||
public AjaxResult save(@RequestBody @Validated(Create.class) ProjectDTO project){
|
||||
WrkProject wrkProject = new WrkProject();
|
||||
BeanUtil.copyProperties(project, wrkProject);
|
||||
Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
|
||||
wrkProject.setDeptId(deptId);
|
||||
projectService.save(wrkProject);
|
||||
|
||||
return AjaxResult.success(wrkProject.getProjectId());
|
||||
}
|
||||
|
||||
//
|
||||
// @SysLog(value = "岗位", businessType = BusinessType.EXPORT)
|
||||
// @RequiresPermissions("system:post:export")
|
||||
// @PostMapping("/export")
|
||||
// public void export(HttpServletResponse response, SysPost post)
|
||||
// {
|
||||
// CommonParam commonParam = CommonParam.buildAllRequest();
|
||||
// List<SysPost> list = postService.allPostList(post, commonParam);
|
||||
// ExcelUtils.exportList(response, SysPost.class,list, "岗位数据");
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 根据岗位编号获取详细信息
|
||||
// */
|
||||
// @RequiresPermissions("system:post:query")
|
||||
// @GetMapping(value = "/{postId}")
|
||||
// public AjaxResult getInfo(@PathVariable Long postId)
|
||||
// {
|
||||
// return AjaxResult.success(postService.getById(postId));
|
||||
// }
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
package com.chushang.inspection.project.controller;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
/**
|
||||
* @auther: zhao
|
||||
* @date: 2024/6/15 11:22
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequestMapping(value = "/project/payment")
|
||||
public class WrkProjectPaymentController {
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
package com.chushang.inspection.project.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.chushang.inspection.project.entity.po.WrkAudit;
|
||||
|
||||
/**
|
||||
* @auther: zhao
|
||||
* @date: 2024/6/15 10:51
|
||||
*/
|
||||
public interface WrkAuditMapper extends BaseMapper<WrkAudit> {
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
package com.chushang.inspection.project.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.chushang.inspection.project.entity.po.WrkProjectContract;
|
||||
|
||||
/**
|
||||
* @auther: zhao
|
||||
* @date: 2024/6/15 10:51
|
||||
*/
|
||||
public interface WrkProjectContractMapper extends BaseMapper<WrkProjectContract> {
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
package com.chushang.inspection.project.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.chushang.inspection.project.entity.po.WrkProject;
|
||||
|
||||
/**
|
||||
* @auther: zhao
|
||||
* @date: 2024/6/15 10:51
|
||||
*/
|
||||
public interface WrkProjectMapper extends BaseMapper<WrkProject> {
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
package com.chushang.inspection.project.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.chushang.inspection.project.entity.po.WrkProjectPayment;
|
||||
|
||||
/**
|
||||
* @auther: zhao
|
||||
* @date: 2024/6/15 10:51
|
||||
*/
|
||||
public interface WrkProjectPaymentMapper extends BaseMapper<WrkProjectPayment> {
|
||||
}
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
package com.chushang.inspection.project.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.chushang.inspection.project.entity.po.WrkAudit;
|
||||
import com.chushang.inspection.project.mapper.WrkAuditMapper;
|
||||
|
||||
/**
|
||||
* @auther: zhao
|
||||
* @date: 2024/6/15 10:51
|
||||
*/
|
||||
@Slf4j
|
||||
@Service
|
||||
public class WrkAuditService extends ServiceImpl<WrkAuditMapper, WrkAudit> implements IService<WrkAudit> {
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
package com.chushang.inspection.project.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.chushang.inspection.project.mapper.WrkProjectContractMapper;
|
||||
import com.chushang.inspection.project.entity.po.WrkProjectContract;
|
||||
|
||||
/**
|
||||
* @auther: zhao
|
||||
* @date: 2024/6/15 10:51
|
||||
*/
|
||||
@Slf4j
|
||||
@Service
|
||||
public class WrkProjectContractService extends ServiceImpl<WrkProjectContractMapper, WrkProjectContract> implements IService<WrkProjectContract> {
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
package com.chushang.inspection.project.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.chushang.inspection.project.entity.po.WrkProjectPayment;
|
||||
import com.chushang.inspection.project.mapper.WrkProjectPaymentMapper;
|
||||
|
||||
/**
|
||||
* @auther: zhao
|
||||
* @date: 2024/6/15 10:51
|
||||
*/
|
||||
@Slf4j
|
||||
@Service
|
||||
public class WrkProjectPaymentService extends ServiceImpl<WrkProjectPaymentMapper, WrkProjectPayment> implements IService<WrkProjectPayment> {
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
package com.chushang.inspection.project.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.chushang.common.mybatis.page.CommonParam;
|
||||
import com.chushang.common.mybatis.utils.PageResult;
|
||||
import com.chushang.common.mybatis.utils.WrapperUtils;
|
||||
import com.chushang.datascope.annotation.DataScope;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.chushang.inspection.project.entity.po.WrkProject;
|
||||
import com.chushang.inspection.project.mapper.WrkProjectMapper;
|
||||
|
||||
/**
|
||||
* @auther: zhao
|
||||
* @date: 2024/6/15 10:51
|
||||
*/
|
||||
@Slf4j
|
||||
@Service
|
||||
public class WrkProjectService extends ServiceImpl<WrkProjectMapper, WrkProject> implements IService<WrkProject> {
|
||||
|
||||
@DataScope(tableAlias= "wrk_project")
|
||||
public PageResult pageList(WrkProject project, CommonParam commonParam) {
|
||||
LambdaQueryWrapper<WrkProject> queryWrapper = WrapperUtils.builder(project, project, commonParam);
|
||||
IPage<WrkProject> page = this.page(
|
||||
new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(commonParam.getPage(), commonParam.getLimit()),
|
||||
queryWrapper
|
||||
);
|
||||
return new PageResult(page);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
<?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.chushang.inspection.project.mapper.WrkAuditMapper">
|
||||
<resultMap id="BaseResultMap" type="com.chushang.inspection.project.entity.po.WrkAudit">
|
||||
<!--@mbg.generated-->
|
||||
<!--@Table wrk_audit-->
|
||||
<id column="audit_id" jdbcType="BIGINT" property="auditId" />
|
||||
<result column="third_id" jdbcType="BIGINT" property="thirdId" />
|
||||
<result column="audit_status" jdbcType="SMALLINT" property="auditStatus" />
|
||||
<result column="third_type" jdbcType="SMALLINT" property="thirdType" />
|
||||
<result column="audit_time" jdbcType="TIMESTAMP" property="auditTime" />
|
||||
<result column="audit_user_id" jdbcType="BIGINT" property="auditUserId" />
|
||||
<result column="audit_name" jdbcType="VARCHAR" property="auditName" />
|
||||
<result column="sub_audit_user_id" jdbcType="BIGINT" property="subAuditUserId" />
|
||||
<result column="sub_audit_name" jdbcType="VARCHAR" property="subAuditName" />
|
||||
<result column="remark" jdbcType="VARCHAR" property="remark" />
|
||||
<result column="version" jdbcType="BIGINT" property="version" />
|
||||
<result column="del_state" jdbcType="BOOLEAN" property="delState" />
|
||||
<result column="create_by" jdbcType="VARCHAR" property="createBy" />
|
||||
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
|
||||
<result column="update_by" jdbcType="VARCHAR" property="updateBy" />
|
||||
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List">
|
||||
<!--@mbg.generated-->
|
||||
audit_id, third_id, audit_status, third_type, audit_time, audit_user_id, audit_name,
|
||||
sub_audit_user_id, sub_audit_name, remark, version, del_state, create_by, create_time,
|
||||
update_by, update_time
|
||||
</sql>
|
||||
</mapper>
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
<?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.chushang.inspection.project.mapper.WrkProjectContractMapper">
|
||||
<resultMap id="BaseResultMap" type="com.chushang.inspection.project.entity.po.WrkProjectContract">
|
||||
<!--@mbg.generated-->
|
||||
<!--@Table wrk_project_contract-->
|
||||
<id column="contract_id" jdbcType="BIGINT" property="contractId" />
|
||||
<result column="project_id" jdbcType="BIGINT" property="projectId" />
|
||||
<result column="remark" jdbcType="VARCHAR" property="remark" />
|
||||
<result column="contract_url" jdbcType="VARCHAR" property="contractUrl" />
|
||||
<result column="contract_start_time" jdbcType="TIMESTAMP" property="contractStartTime" />
|
||||
<result column="contract_end_time" jdbcType="TIMESTAMP" property="contractEndTime" />
|
||||
<result column="contract_amount" jdbcType="DECIMAL" property="contractAmount" />
|
||||
<result column="audit_status" jdbcType="SMALLINT" property="auditStatus" />
|
||||
<result column="project_effect" jdbcType="SMALLINT" property="projectEffect" />
|
||||
<result column="payment_state" jdbcType="SMALLINT" property="paymentState" />
|
||||
<result column="version" jdbcType="BIGINT" property="version" />
|
||||
<result column="del_state" jdbcType="BOOLEAN" property="delState" />
|
||||
<result column="create_by" jdbcType="VARCHAR" property="createBy" />
|
||||
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
|
||||
<result column="update_by" jdbcType="VARCHAR" property="updateBy" />
|
||||
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List">
|
||||
<!--@mbg.generated-->
|
||||
contract_id, project_id, remark, contract_url, contract_start_time, contract_end_time,
|
||||
contract_amount, audit_status, project_effect, payment_state, version, del_state,
|
||||
create_by, create_time, update_by, update_time
|
||||
</sql>
|
||||
</mapper>
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
<?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.chushang.inspection.project.mapper.WrkProjectMapper">
|
||||
<resultMap id="BaseResultMap" type="com.chushang.inspection.project.entity.po.WrkProject">
|
||||
<!--@mbg.generated-->
|
||||
<!--@Table wrk_project-->
|
||||
<id column="project_id" jdbcType="BIGINT" property="projectId" />
|
||||
<result column="project_name" jdbcType="VARCHAR" property="projectName" />
|
||||
<result column="project_concat" jdbcType="VARCHAR" property="projectConcat" />
|
||||
<result column="project_phone" jdbcType="VARCHAR" property="projectPhone" />
|
||||
<result column="dept_id" jdbcType="BIGINT" property="deptId" />
|
||||
<result column="audit_status" jdbcType="SMALLINT" property="auditStatus" />
|
||||
<result column="remark" jdbcType="VARCHAR" property="remark" />
|
||||
<result column="version" jdbcType="BIGINT" property="version" />
|
||||
<result column="del_state" jdbcType="BOOLEAN" property="delState" />
|
||||
<result column="create_by" jdbcType="VARCHAR" property="createBy" />
|
||||
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
|
||||
<result column="update_by" jdbcType="VARCHAR" property="updateBy" />
|
||||
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List">
|
||||
<!--@mbg.generated-->
|
||||
project_id, project_name, project_concat, project_phone, dept_id, audit_status, remark,
|
||||
version, del_state, create_by, create_time, update_by, update_time
|
||||
</sql>
|
||||
</mapper>
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
<?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.chushang.inspection.project.mapper.WrkProjectPaymentMapper">
|
||||
<resultMap id="BaseResultMap" type="com.chushang.inspection.project.entity.po.WrkProjectPayment">
|
||||
<!--@mbg.generated-->
|
||||
<!--@Table wrk_project_payment-->
|
||||
<result column="payment_id" jdbcType="BIGINT" property="paymentId" />
|
||||
<result column="project_id" jdbcType="BIGINT" property="projectId" />
|
||||
<result column="contracty_id" jdbcType="BIGINT" property="contractyId" />
|
||||
<result column="project_name" jdbcType="VARCHAR" property="projectName" />
|
||||
<result column="dept_id" jdbcType="BIGINT" property="deptId" />
|
||||
<result column="payment_amount" jdbcType="DECIMAL" property="paymentAmount" />
|
||||
<result column="payment_receipt" jdbcType="VARCHAR" property="paymentReceipt" />
|
||||
<result column="payment_date" jdbcType="VARCHAR" property="paymentDate" />
|
||||
<result column="payment_month" jdbcType="VARCHAR" property="paymentMonth" />
|
||||
<result column="remark" jdbcType="VARCHAR" property="remark" />
|
||||
<result column="version" jdbcType="BIGINT" property="version" />
|
||||
<result column="del_state" jdbcType="BOOLEAN" property="delState" />
|
||||
<result column="create_by" jdbcType="VARCHAR" property="createBy" />
|
||||
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
|
||||
<result column="update_by" jdbcType="VARCHAR" property="updateBy" />
|
||||
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List">
|
||||
<!--@mbg.generated-->
|
||||
payment_id, project_id, contracty_id, project_name, dept_id, payment_amount, payment_receipt,
|
||||
payment_date, payment_month, remark, version, del_state, create_by, create_time,
|
||||
update_by, update_time
|
||||
</sql>
|
||||
</mapper>
|
||||
|
|
@ -29,6 +29,11 @@
|
|||
<artifactId>inspection-feign</artifactId>
|
||||
<version>1.0.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.chushang</groupId>
|
||||
<artifactId>task-feign</artifactId>
|
||||
<version>1.0.0</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
<dependencies>
|
||||
|
|
|
|||
Loading…
Reference in New Issue