Skip to content

A
amos-boot-zx-biz
Commit 99a57b00 authored by chenzhao's avatar chenzhao
Browse files
Options

发货管理优化

parent cf907883
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 732 additions and 17 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/MyBatisPlusCodeGenerator.java
View file @ 99a57b00
......@@ -26,29 +26,30 @@ public class MyBatisPlusCodeGenerator {
/**
* 项目名称缩写
*/
static String projectShortName = "tzs";
static String projectShortName = "jxiop";
static String projectShortName1 = "hygf";
/**
* 项目api目录
*/
static String apiAddress = "/amos-boot-module/amos-boot-module-api/" + "amos-boot-module-" + projectShortName +
static String apiAddress = "/amos-boot-system-" + projectShortName + "/amos-boot-module-" + projectShortName1 +
"-api/";
/**
* 项目biz目录
*/
static String bizAddress = "/amos-boot-module/amos-boot-module-biz/" + "amos-boot-module-" + projectShortName +
static String bizAddress = "/amos-boot-system-" + projectShortName + "/amos-boot-module-" + projectShortName1 +
"-biz/";
/**
* 项目api路径
*/
static String apiPath = apiAddress + "src/main/java/com/yeejoin/amos/boot/module/" + projectShortName + "/api";
static String apiPath = apiAddress + "src/main/java/com/yeejoin/amos/boot/module/" + projectShortName1 + "/api";
/**
* 项目biz路径
*/
static String bizPath = bizAddress + "src/main/java/com/yeejoin/amos/boot/module/" + projectShortName + "/biz";
static String bizPath = bizAddress + "src/main/java/com/yeejoin/amos/boot/module/" + projectShortName1 + "/biz";
/**
* 接口及实体等代码生成路径
......@@ -102,12 +103,12 @@ public class MyBatisPlusCodeGenerator {
gc.setActiveRecord(false);
// 数据源配置
DataSourceConfig dsc = new DataSourceConfig();
dsc.setUrl("jdbc:mysql://172.16.6.60:3306/amos-tzs-biz?serverTimezone=GMT%2B8");
dsc.setUrl("jdbc:mysql://47.92.234.253:3306/amos_project?serverTimezone=GMT%2B8");
// dsc.setSchemaName("public");
// dsc.setDriverName("com.mysql.jdbc.Driver");
dsc.setDriverName("com.mysql.cj.jdbc.Driver");
dsc.setUsername("root");
dsc.setPassword("root_123");
dsc.setPassword("Yeejoin@2020");
dsc.setTypeConvert(new ITypeConvert() {
@Override
......@@ -292,7 +293,8 @@ public class MyBatisPlusCodeGenerator {
strategy.setControllerMappingHyphenStyle(true);
strategy.setTablePrefix();
//去除表名前缀
strategy.setTablePrefix("t_", "tb_", "sys_", "other_", "rpm_", "s_", "tcb_", "cb_", "tz_", "jc_", "jcb_");
strategy.setTablePrefix("tz_" + projectShortName1 + "_", "t_", "tb_", "sys_", "other_", "rpm_", "s_", "tcb_",
"cb_", "tz_", "jc_", "jcb_", "flc_");
// 设置父级Controller
strategy.setSuperControllerClass("com.yeejoin.amos.boot.biz.common.controller.BaseController");
autoGenerator.setStrategy(strategy);
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/ArrivalStateeEnum.java
View file @ 99a57b00
......@@ -15,6 +15,7 @@ public enum ArrivalStateeEnum {
待收货("待收货", "待收货"),
已收货("已收货", "已收货"),
补货申请("补货申请", "补货申请"),
已作废("已作废", "已作废"),
......@@ -30,7 +31,8 @@ public enum ArrivalStateeEnum {
并网完成("并网完成", "并网完成"),
线上验收("线上验收", "线上验收"),
线下验收("线下验收", "线下验收"),
验收完成("验收完成", "验收完成");
验收完成("验收完成", "验收完成"),
待发货("待发货", "待发货");
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/DeliveryStateeEnum.java
View file @ 99a57b00
......@@ -15,6 +15,15 @@ public enum DeliveryStateeEnum {
待发货("待发货", "待发货"),
暂存发货("暂存发货", "暂存发货"),
待提交("待提交", "待提交"),
待确认("待确认", "待确认"),
待补货("待补货", "待补货"),
待审核("待审核", "待审核"),
已完成("已完成", "已完成"),
已发货("已发货", "已发货"),
已作废("已作废", "已作废");
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/HygfPreparationMoneyAuditingDto.java 0 → 100644
View file @ 99a57b00
package com.yeejoin.amos.boot.module.hygf.api.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 投融审核表
*
* @author system_generator
* @date 2024-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="HygfPreparationMoneyAuditingDto", description="投融审核表")
public class HygfPreparationMoneyAuditingDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "工作流实例ID")
private String instanceId;
@ApiModelProperty(value = "下一个节点角色权限id")
private String nextExecutorIds;
@ApiModelProperty(value = "任务发起人id")
private String promoter;
@ApiModelProperty(value = "流程下一节点id")
private String nextTaskId;
@ApiModelProperty(value = "下一节点可执行人逗号分割")
private String nextExecuteUserIds;
@ApiModelProperty(value = "工作流发起人id")
private String createUserId;
@ApiModelProperty(value = "下个节点名称")
private String nextNodeName;
@ApiModelProperty(value = "下个节点key")
private String nextNodeKey;
@ApiModelProperty(value = "状态")
private String status;
@ApiModelProperty(value = "农户id")
private Long preparationMoneyId;
@ApiModelProperty(value = " 待执行节点小程序路由")
private String nodeRouting;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/HygfReplenishmentDto.java 0 → 100644
View file @ 99a57b00
package com.yeejoin.amos.boot.module.hygf.api.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
*
*
* @author system_generator
* @date 2024-07-02
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="HygfReplenishmentDto", description="")
public class HygfReplenishmentDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "发货单id")
private Long preparationMoneyId;
@ApiModelProperty(value = "补货描述")
private String desc;
@ApiModelProperty(value = "补货文件")
private String file;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/HygfPreparationMoneyAuditing.java 0 → 100644
View file @ 99a57b00
package com.yeejoin.amos.boot.module.hygf.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* 投融审核表
*
* @author system_generator
* @date 2024-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("hygf_preparation_money_auditing")
public class HygfPreparationMoneyAuditing extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 工作流实例ID
*/
@TableField("instance_id")
private String instanceId;
/**
* 下一个节点角色权限id
*/
@TableField("next_executor_ids")
private String nextExecutorIds;
/**
* 任务发起人id
*/
@TableField("promoter")
private String promoter;
/**
* 流程下一节点id
*/
@TableField("next_task_id")
private String nextTaskId;
/**
* 下一节点可执行人逗号分割
*/
@TableField("next_execute_user_ids")
private String nextExecuteUserIds;
/**
* 工作流发起人id
*/
@TableField("create_user_id")
private String createUserId;
/**
* 下个节点名称
*/
@TableField("next_node_name")
private String nextNodeName;
/**
* 下个节点key
*/
@TableField("next_node_key")
private String nextNodeKey;
/**
* 状态
*/
@TableField("status")
private String status;
/**
* 农户id
*/
@TableField("preparation_money_id")
private Long preparationMoneyId;
/**
* 待执行节点小程序路由
*/
@TableField("node_routing")
private String nodeRouting;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/HygfReplenishment.java 0 → 100644
View file @ 99a57b00
package com.yeejoin.amos.boot.module.hygf.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.Value;
import lombok.experimental.Accessors;
import java.util.Date;
import java.util.List;
/**
*
*
* @author system_generator
* @date 2024-07-02
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("hygf_replenishment")
public class HygfReplenishment extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 发货单id
*/
@TableField("preparation_money_id")
private Long preparationMoneyId;
/**
* 补货描述
*/
@TableField("desc")
private String desc;
/**
* 补货文件
*/
@TableField(value = "file" , typeHandler = FastjsonTypeHandler.class)
private List<Object> file;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/PeasantHousehold.java
View file @ 99a57b00
......@@ -192,6 +192,12 @@ public class PeasantHousehold extends BaseEntity {
/**
* 已发货，已收货，
*/
@TableField("preparation_money_state")
private String preparationMoneyState;
/**
* 备货状态
*/
@TableField("construction_state")
private String constructionState;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/PreparationMoney.java
View file @ 99a57b00
......@@ -148,7 +148,8 @@ public class PreparationMoney extends BaseEntity {
@TableField(exist = false)
private List<PreparationMoneyLog> preparationMoneyLog; //发货单流水
//订单状态
@TableField("order_status")
private String orderStatus;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/HygfPreparationMoneyAuditingMapper.java 0 → 100644
View file @ 99a57b00
package com.yeejoin.amos.boot.module.hygf.api.mapper;
import com.yeejoin.amos.boot.module.hygf.api.entity.HygfPreparationMoneyAuditing;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 投融审核表 Mapper 接口
*
* @author system_generator
* @date 2024-06-18
*/
public interface HygfPreparationMoneyAuditingMapper extends BaseMapper<HygfPreparationMoneyAuditing> {
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/HygfReplenishmentMapper.java 0 → 100644
View file @ 99a57b00
package com.yeejoin.amos.boot.module.hygf.api.mapper;
import com.yeejoin.amos.boot.module.hygf.api.entity.HygfReplenishment;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* Mapper 接口
*
* @author system_generator
* @date 2024-07-02
*/
public interface HygfReplenishmentMapper extends BaseMapper<HygfReplenishment> {
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PeasantHouseholdMapper.java
View file @ 99a57b00
......@@ -31,7 +31,7 @@ public interface PeasantHouseholdMapper extends BaseMapper<PeasantHousehold> {
);
@UserEmpower(field={},dealerField={"developer_code","regional_companies_code","developer_user_id"} ,fieldConditions ={"eq","in","eq"} ,relationship="and")
List<PeasantHousehold> queryForPage( String developerCode,String ownersName,Long developerId,Integer isCertified);
List<PeasantHousehold> queryForPage( String developerCode,String ownersName,Long developerId,Integer isCertified,String preparationMoneyState);
List<Map<String,Object>> selectUserIsHouse(String telephone);
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IHygfPreparationMoneyAuditingService.java 0 → 100644
View file @ 99a57b00
package com.yeejoin.amos.boot.module.hygf.api.service;
/**
* 投融审核表接口类
*
* @author system_generator
* @date 2024-06-18
*/
public interface IHygfPreparationMoneyAuditingService {
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IHygfReplenishmentService.java 0 → 100644
View file @ 99a57b00
package com.yeejoin.amos.boot.module.hygf.api.service;
/**
* 接口类
*
* @author system_generator
* @date 2024-07-02
*/
public interface IHygfReplenishmentService {
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/HygfPreparationMoneyAuditingMapper.xml 0 → 100644
View file @ 99a57b00
<?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.yeejoin.amos.boot.module.hygf.api.mapper.HygfPreparationMoneyAuditingMapper">
</mapper>
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/HygfReplenishmentMapper.xml 0 → 100644
View file @ 99a57b00
<?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.yeejoin.amos.boot.module.hygf.api.mapper.HygfReplenishmentMapper">
</mapper>
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PeasantHouseholdMapper.xml
View file @ 99a57b00
......@@ -58,6 +58,12 @@ and hygf_document_station.station_id is not null
<if test="ownersName!=null and ownersName !=''">
and owners_name like concat ('%',#{ownersName},'%')
</if>
<if test="preparationMoneyState!=null and preparationMoneyState !='' and preparationMoneyState == '0' ">
and preparation_money_state = '待发货'
</if>
<if test="preparationMoneyState!=null and preparationMoneyState !='' and preparationMoneyState == '1' ">
and preparation_money_state != '待发货'
</if>
<if test="developerId!=null and developerId !=''">
and developer_id = #{developerId}
</if>
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HouseholdContractController.java
View file @ 99a57b00
......@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.hygf.api.Enum.ArrivalStateeEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
......@@ -229,7 +230,14 @@ public class HouseholdContractController extends BaseController {
wrapper.eq(ToDoTasks::getState, "待办");
wrapper.eq(ToDoTasks::getBusinessId, householdContrac.getSequenceNbr());
ToDoTasks doTasks= toDoTasksMapper.selectOne(wrapper);
if(doTasks!=null){
PeasantHousehold peasantHousehold = peasantHouseholdServiceImpl.getDataByState(householdContrac.getPeasantHouseholdId());
if (peasantHousehold != null){
peasantHousehold.setPreparationMoneyState(ArrivalStateeEnum.待发货.getCode());
peasantHouseholdServiceImpl.getBaseMapper().updateById(peasantHousehold);
}
if(doTasks!=null){
doTasks.setState("已办");
doTasks.setCompleteTime(new Date());
toDoTasksMapper.updateById(doTasks);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HygfPreparationMoneyAuditingController.java 0 → 100644
View file @ 99a57b00
package com.yeejoin.amos.boot.module.hygf.biz.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import java.util.List;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.HygfPreparationMoneyAuditingServiceImpl;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import org.springframework.beans.factory.annotation.Autowired;
import javax.servlet.http.HttpServletRequest;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.hygf.api.dto.HygfPreparationMoneyAuditingDto;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
/**
* 投融审核表
*
* @author system_generator
* @date 2024-06-18
*/
@RestController
@Api(tags = "投融审核表Api")
@RequestMapping(value = "/hygf-preparation-money-auditing")
public class HygfPreparationMoneyAuditingController extends BaseController {
@Autowired
HygfPreparationMoneyAuditingServiceImpl hygfPreparationMoneyAuditingServiceImpl;
/**
* 新增投融审核表
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增投融审核表", notes = "新增投融审核表")
public ResponseModel<HygfPreparationMoneyAuditingDto> save(@RequestBody HygfPreparationMoneyAuditingDto model) {
model = hygfPreparationMoneyAuditingServiceImpl.createWithModel(model);
return ResponseHelper.buildResponse(model);
}
/**
* 根据sequenceNbr更新
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新投融审核表", notes = "根据sequenceNbr更新投融审核表")
public ResponseModel<HygfPreparationMoneyAuditingDto> updateBySequenceNbrHygfPreparationMoneyAuditing(@RequestBody HygfPreparationMoneyAuditingDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(hygfPreparationMoneyAuditingServiceImpl.updateWithModel(model));
}
/**
* 根据sequenceNbr删除
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除投融审核表", notes = "根据sequenceNbr删除投融审核表")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
return ResponseHelper.buildResponse(hygfPreparationMoneyAuditingServiceImpl.removeById(sequenceNbr));
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个投融审核表", notes = "根据sequenceNbr查询单个投融审核表")
public ResponseModel<HygfPreparationMoneyAuditingDto> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(hygfPreparationMoneyAuditingServiceImpl.queryBySeq(sequenceNbr));
}
/**
* 列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "投融审核表分页查询", notes = "投融审核表分页查询")
public ResponseModel<Page<HygfPreparationMoneyAuditingDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size) {
Page<HygfPreparationMoneyAuditingDto> page = new Page<HygfPreparationMoneyAuditingDto>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(hygfPreparationMoneyAuditingServiceImpl.queryForHygfPreparationMoneyAuditingPage(page));
}
/**
* 列表全部数据查询
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "投融审核表列表全部数据查询", notes = "投融审核表列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<HygfPreparationMoneyAuditingDto>> selectForList() {
return ResponseHelper.buildResponse(hygfPreparationMoneyAuditingServiceImpl.queryForHygfPreparationMoneyAuditingList());
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HygfReplenishmentController.java 0 → 100644
View file @ 99a57b00
package com.yeejoin.amos.boot.module.hygf.biz.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import java.util.List;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.HygfReplenishmentServiceImpl;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import org.springframework.beans.factory.annotation.Autowired;
import javax.servlet.http.HttpServletRequest;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.hygf.api.dto.HygfReplenishmentDto;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
/**
*
*
* @author system_generator
* @date 2024-07-02
*/
@RestController
@Api(tags = "Api")
@RequestMapping(value = "/hygf-replenishment")
public class HygfReplenishmentController extends BaseController {
@Autowired
HygfReplenishmentServiceImpl hygfReplenishmentServiceImpl;
/**
* 新增
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public ResponseModel<HygfReplenishmentDto> save(@RequestBody HygfReplenishmentDto model) {
model = hygfReplenishmentServiceImpl.createWithModel(model);
return ResponseHelper.buildResponse(model);
}
/**
* 根据sequenceNbr更新
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
public ResponseModel<HygfReplenishmentDto> updateBySequenceNbrHygfReplenishment(@RequestBody HygfReplenishmentDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(hygfReplenishmentServiceImpl.updateWithModel(model));
}
/**
* 根据sequenceNbr删除
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
return ResponseHelper.buildResponse(hygfReplenishmentServiceImpl.removeById(sequenceNbr));
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
public ResponseModel<HygfReplenishmentDto> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(hygfReplenishmentServiceImpl.queryBySeq(sequenceNbr));
}
/**
* 列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "分页查询", notes = "分页查询")
public ResponseModel<Page<HygfReplenishmentDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size) {
Page<HygfReplenishmentDto> page = new Page<HygfReplenishmentDto>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(hygfReplenishmentServiceImpl.queryForHygfReplenishmentPage(page));
}
/**
* 列表全部数据查询
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<HygfReplenishmentDto>> selectForList() {
return ResponseHelper.buildResponse(hygfReplenishmentServiceImpl.queryForHygfReplenishmentList());
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PeasantHouseholdController.java
View file @ 99a57b00
......@@ -208,6 +208,7 @@ public class PeasantHouseholdController extends BaseController {
public ResponseModel<Page<PeasantHousehold>> queryForPage(@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size,
@RequestParam(value = "ownersName",required = false)String ownersName,
@RequestParam(value = "preparationMoneyState",required = false)String preparationMoneyState,
@RequestParam(value = "developerId",required = false)Long developerId) {
Page<PeasantHousehold> page = new Page<PeasantHousehold>();
page.setCurrent(current);
......@@ -221,7 +222,7 @@ public class PeasantHouseholdController extends BaseController {
// String orgCode = userUnitInformationDto.getAmosDealerOrgCode();
Integer isCertified = PeasantHouseholdEnum.已认证.getCode();
return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.queryForPeasantHouseholdPage(page, null,ownersName,developerId,isCertified));
return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.queryForPeasantHouseholdPage(page, null,ownersName,developerId,isCertified,preparationMoneyState));
}
/**
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PreparationMoneyController.java
View file @ 99a57b00
......@@ -10,14 +10,18 @@ import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationMoneyDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationPageDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.DesignInformation;
import com.yeejoin.amos.boot.module.hygf.api.entity.HygfReplenishment;
import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
import com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoney;
import com.yeejoin.amos.boot.module.hygf.api.mapper.DocumentStationMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.PreparationMoneyMapper;
import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseNewUtil;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.DesignInformationServiceImpl;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.HygfReplenishmentServiceImpl;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.PreparationMoneyServiceImpl;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import io.seata.spring.annotation.GlobalTransactional;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -54,6 +58,8 @@ public class PreparationMoneyController extends BaseController {
PersonnelBusinessMapper personnelBusinessMapper;
@Autowired
DocumentStationMapper documentStationMapper;
@Autowired
HygfReplenishmentServiceImpl hygfReplenishmentService;
/**
* 新增发货单
*
......@@ -62,8 +68,10 @@ public class PreparationMoneyController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增发货单", notes = "新增发货单")
public ResponseModel<PreparationMoney> save( @RequestBody PreparationMoney model) {
@GlobalTransactional
public ResponseModel<PreparationMoney> save( @RequestParam("isSubmit") String isSubmit, @RequestBody PreparationMoney model) {
AgencyUserModel agencyUserModel= getUserInfo();
// model = preparationMoneyServiceImpl.saveOrUpdateObjectNew(model,agencyUserModel, isSubmit);
model = preparationMoneyServiceImpl.saveOrUpdateObject(model,agencyUserModel);
return ResponseHelper.buildResponse(model);
}
......@@ -216,7 +224,7 @@ public class PreparationMoneyController extends BaseController {
) {
List<PeasantHousehold> list=preparationMoneyMapper.getPeasantHouseholdData(sequenceNbr,ownersName);
Page<PeasantHousehold> pagenew = new Page<PeasantHousehold>();
Page<PeasantHousehold> pagenew = new Page<>();
pagenew.setRecords(list);
pagenew.setTotal(list.size());
return ResponseHelper.buildResponse(pagenew);
......@@ -242,4 +250,57 @@ public class PreparationMoneyController extends BaseController {
return ResponseHelper.buildResponse(preparationMoneyServiceImpl.selectOnePreparationMoney(sequenceNbr));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/uploadVoucher")
@ApiOperation(httpMethod = "POST",value = "上传收获凭证", notes = "上传收获凭证")
@GlobalTransactional
public ResponseModel uploadVoucher(@RequestParam(value = "instanceId") String instanceId,PreparationMoney model, String isSubmit) {
preparationMoneyServiceImpl.uploadVoucher(model,instanceId,isSubmit);
return CommonResponseNewUtil.failure();
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/excuteFlow")
@ApiOperation(httpMethod = "POST",value = "收货审核", notes = "收货审核")
@GlobalTransactional
public ResponseModel excuteFlow(@RequestParam(value = "instanceId") String instanceId, @RequestBody Map<String, Object> kv) {
preparationMoneyServiceImpl.excuteFlow(instanceId,kv);
return CommonResponseNewUtil.failure();
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/replenishmentSubmit")
@ApiOperation(httpMethod = "POST",value = "补货申请", notes = "补货申请")
@GlobalTransactional
public ResponseModel replenishmentSubmit(@RequestParam(value = "sequenceNbr") Long sequenceNbr, @RequestBody HygfReplenishment hygfReplenishment) {
hygfReplenishment.setPreparationMoneyId(sequenceNbr);
hygfReplenishmentService.save(hygfReplenishment);
preparationMoneyServiceImpl.replenishmentSubmit(sequenceNbr);
return CommonResponseNewUtil.failure();
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/replenishmentRollback")
@ApiOperation(httpMethod = "PUT",value = "补货撤回", notes = "补货撤回")
public ResponseModel replenishmentRollback(@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
preparationMoneyServiceImpl.replenishmentRollback(sequenceNbr);
return CommonResponseNewUtil.failure();
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/replenishmentAudit")
@ApiOperation(httpMethod = "POST",value = "补货审核", notes = "补货审核")
@GlobalTransactional
public ResponseModel replenishmentAudit(@RequestParam(value = "sequenceNbr") Long sequenceNbr,@RequestBody Map<String,Object> kv) {
preparationMoneyServiceImpl.replenishmentAudit(sequenceNbr,kv);
return CommonResponseNewUtil.failure();
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/HygfPreparationMoneyAuditingServiceImpl.java 0 → 100644
View file @ 99a57b00
package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import com.yeejoin.amos.boot.module.hygf.api.entity.HygfPreparationMoneyAuditing;
import com.yeejoin.amos.boot.module.hygf.api.mapper.HygfPreparationMoneyAuditingMapper;
import com.yeejoin.amos.boot.module.hygf.api.service.IHygfPreparationMoneyAuditingService;
import com.yeejoin.amos.boot.module.hygf.api.dto.HygfPreparationMoneyAuditingDto;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List;
/**
* 投融审核表服务实现类
*
* @author system_generator
* @date 2024-06-18
*/
@Service
public class HygfPreparationMoneyAuditingServiceImpl extends BaseService<HygfPreparationMoneyAuditingDto,HygfPreparationMoneyAuditing,HygfPreparationMoneyAuditingMapper> implements IHygfPreparationMoneyAuditingService {
/**
* 分页查询
*/
public Page<HygfPreparationMoneyAuditingDto> queryForHygfPreparationMoneyAuditingPage(Page<HygfPreparationMoneyAuditingDto> page) {
return this.queryForPage(page, null, false);
}
/**
* 列表查询 示例
*/
public List<HygfPreparationMoneyAuditingDto> queryForHygfPreparationMoneyAuditingList() {
return this.queryForList("" , false);
}
}
\ No newline at end of file
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/HygfReplenishmentServiceImpl.java 0 → 100644
View file @ 99a57b00
package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import com.yeejoin.amos.boot.module.hygf.api.entity.HygfReplenishment;
import com.yeejoin.amos.boot.module.hygf.api.mapper.HygfReplenishmentMapper;
import com.yeejoin.amos.boot.module.hygf.api.service.IHygfReplenishmentService;
import com.yeejoin.amos.boot.module.hygf.api.dto.HygfReplenishmentDto;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List;
/**
* 服务实现类
*
* @author system_generator
* @date 2024-07-02
*/
@Service
public class HygfReplenishmentServiceImpl extends BaseService<HygfReplenishmentDto,HygfReplenishment,HygfReplenishmentMapper> implements IHygfReplenishmentService {
/**
* 分页查询
*/
public Page<HygfReplenishmentDto> queryForHygfReplenishmentPage(Page<HygfReplenishmentDto> page) {
return this.queryForPage(page, null, false);
}
/**
* 列表查询 示例
*/
public List<HygfReplenishmentDto> queryForHygfReplenishmentList() {
return this.queryForList("" , false);
}
}
\ No newline at end of file
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PowerStationServiceImpl.java
View file @ 99a57b00
package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
......@@ -85,6 +86,8 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
AmosRequestContext requestContext;
@Autowired
WorkflowImpl workflow;
@Autowired
HouseholdContractMapper householdContractMapper;
public Page<PowerStationDto> queryForPowerStationUserRoles(Page<PowerStationDto> page, String powerStationCode,
String ownersName, AgencyUserModel userInfo, String serviceAgent, String regionalCompaniesName, String processStatus) {
......@@ -256,6 +259,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
switch (nodeByCode) {
case 设计审核:
powerStation.setTechnologyStatus(resultObj.getName());
break;
case 投融审核:
powerStation.setDesignStatus(resultObj.getName());
......@@ -347,6 +351,16 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
.selectById(Long.valueOf(peasantHouseholdId));
peasantHousehold.setSurveyOrNot(3);
peasantHousehold.setConstructionState(ArrivalStateeEnum.勘察完成.getCode());
//当勘察完成并且合同双方已盖章 则为待发货
LambdaQueryWrapper<HouseholdContract> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(HouseholdContract::getStatus,"双方已签署");
queryWrapper.eq(HouseholdContract::getPeasantHouseholdId,peasantHousehold.getSequenceNbr());
List<HouseholdContract> householdContracts = householdContractMapper.selectList(queryWrapper);
if (CollectionUtil.isNotEmpty(householdContracts) && householdContracts.size()>0 ){
peasantHousehold.setPreparationMoneyState(ArrivalStateeEnum.待发货.getCode());
}
peasantHouseholdService.saveOrUpdate(peasantHousehold);
}
// }
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/WorkFlowService.java
View file @ 99a57b00
......@@ -57,6 +57,23 @@ public class WorkFlowService {
* 执行
*
* */
public ProcessTaskDTO rollBackTask(String processInstanceId) {
ProcessTaskDTO processTaskDTO;
try {
log.info("工作流撤回任务接口:/rollBackTask},请求参数：{}", processInstanceId);
processTaskDTO = workFlowFeignService.rollBackTask(processInstanceId).getResult();
} catch (Exception e) {
log.error("调用工作流撤回任务接口失败", e);
throw new RuntimeException("调用工作流撤回任务接口失败");
}
return processTaskDTO;
}
/***
* 执行
*
* */
public ProcessTaskDTO complete(String taskId, TaskResultDTO data) {
ProcessTaskDTO processTaskDTO;
try {
......@@ -70,7 +87,6 @@ public class WorkFlowService {
}
public List<WorkflowResultDto> buildWorkFlowInfo(List<ProcessTaskDTO> processTaskDTOS) {
List<WorkflowResultDto> workflowResultDtoList = new ArrayList<>();
processTaskDTOS.forEach(item -> {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment