diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/pom.xml b/chushang-modules/chushang-module-inspection/inspection-feign/pom.xml index ff80ee4..90d0350 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/pom.xml +++ b/chushang-modules/chushang-module-inspection/inspection-feign/pom.xml @@ -11,20 +11,7 @@ com.chushang - chushang-common-feign - - - - com.chushang - chushang-common-data-scope - - - com.chushang - chushang-common-dict - - - com.chushang - chushang-common-log + task-feign diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/ProjectDTO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/ProjectDTO.java new file mode 100644 index 0000000..b41bf3d --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/ProjectDTO.java @@ -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; + +} diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/WrkAudit.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/WrkAudit.java new file mode 100644 index 0000000..9926fb1 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/WrkAudit.java @@ -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; +} diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/WrkProject.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/WrkProject.java new file mode 100644 index 0000000..d310a68 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/WrkProject.java @@ -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; +} diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/WrkProjectContract.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/WrkProjectContract.java new file mode 100644 index 0000000..2478835 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/WrkProjectContract.java @@ -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; +} diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/WrkProjectPayment.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/WrkProjectPayment.java new file mode 100644 index 0000000..16c33fe --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/WrkProjectPayment.java @@ -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; +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/pom.xml b/chushang-modules/chushang-module-inspection/inspection-service/pom.xml index e2cf3a1..2427702 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/pom.xml +++ b/chushang-modules/chushang-module-inspection/inspection-service/pom.xml @@ -46,7 +46,7 @@ false - com.chushang.LoanApplication + com.chushang.InspectionApplication diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/consumer/InspectionConsumerService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/consumer/InspectionConsumerService.java new file mode 100644 index 0000000..7fc1e88 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/consumer/InspectionConsumerService.java @@ -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 { + @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); + } +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkAuditController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkAuditController.java new file mode 100644 index 0000000..0324dad --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkAuditController.java @@ -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 { +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectContractController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectContractController.java new file mode 100644 index 0000000..ab66baf --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectContractController.java @@ -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 { +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java new file mode 100644 index 0000000..df1be6d --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java @@ -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 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)); +// } + + +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectPaymentController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectPaymentController.java new file mode 100644 index 0000000..511e0ee --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectPaymentController.java @@ -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 { +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkAuditMapper.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkAuditMapper.java new file mode 100644 index 0000000..f5254e4 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkAuditMapper.java @@ -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 { +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectContractMapper.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectContractMapper.java new file mode 100644 index 0000000..e91b760 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectContractMapper.java @@ -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 { +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectMapper.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectMapper.java new file mode 100644 index 0000000..5bb9781 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectMapper.java @@ -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 { +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectPaymentMapper.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectPaymentMapper.java new file mode 100644 index 0000000..a403cb8 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectPaymentMapper.java @@ -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 { +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkAuditService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkAuditService.java new file mode 100644 index 0000000..eaeed82 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkAuditService.java @@ -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 implements IService { + +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectContractService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectContractService.java new file mode 100644 index 0000000..e2b3a84 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectContractService.java @@ -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 implements IService { + +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectPaymentService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectPaymentService.java new file mode 100644 index 0000000..67fa985 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectPaymentService.java @@ -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 implements IService { + +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java new file mode 100644 index 0000000..4a05976 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java @@ -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 implements IService { + + @DataScope(tableAlias= "wrk_project") + public PageResult pageList(WrkProject project, CommonParam commonParam) { + LambdaQueryWrapper queryWrapper = WrapperUtils.builder(project, project, commonParam); + IPage page = this.page( + new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(commonParam.getPage(), commonParam.getLimit()), + queryWrapper + ); + return new PageResult(page); + } +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkAuditMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkAuditMapper.xml new file mode 100644 index 0000000..ca85290 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkAuditMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectContractMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectContractMapper.xml new file mode 100644 index 0000000..4c9ae59 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectContractMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectMapper.xml new file mode 100644 index 0000000..8229314 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + project_id, project_name, project_concat, project_phone, dept_id, audit_status, remark, + version, del_state, create_by, create_time, update_by, update_time + + diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectPaymentMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectPaymentMapper.xml new file mode 100644 index 0000000..70b0998 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectPaymentMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + diff --git a/chushang-modules/chushang-module-inspection/pom.xml b/chushang-modules/chushang-module-inspection/pom.xml index 6fcf7c4..1307b28 100644 --- a/chushang-modules/chushang-module-inspection/pom.xml +++ b/chushang-modules/chushang-module-inspection/pom.xml @@ -29,6 +29,11 @@ inspection-feign 1.0.0 + + com.chushang + task-feign + 1.0.0 +