Skip to content

J
jyzb_platformV2
Commit 0ae8a0ca by 李小惠
Options

修改报表数据展示格式（统一展示方式）

parent 62779048
正在显示 包含 140 行增加 和 170 行删除
app-log/error/log-error-2024-02-01.0.log 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
app-log/error/log-error-2024-02-02.0.log 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
app-log/log_total.log
This source diff could not be displayed because it is too large. You can view the blob instead.
app-log/total/log-total-2024-01-31.0.log 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
app-log/total/log-total-2024-02-01.0.log 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
app-log/total/log-total-2024-02-02.0.log 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/QueryOrderLogReq.java
......@@ -76,4 +76,8 @@ public class QueryOrderLogReq extends BaseRequest {
private Date startTime;
private Date endTime;
private Date createTime;
private String processType;
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/EquipmentTypeController.java
......@@ -92,12 +92,12 @@ public class EquipmentTypeController {
@PostMapping(path="/SetTypeParentIds",name="填充装备类型的parent_ids字段#logType=30")
@ApiOperation("填充装备类型的parent_ids字段")
public ResponseResult setTypeParentIds() {
ResponseResult returnMsg = equipmentTypeService.setTypeParentIds();
return returnMsg;
}
// @PostMapping(path="/SetTypeParentIds",name="填充装备类型的parent_ids字段#logType=30")
// @ApiOperation("填充装备类型的parent_ids字段")
// public ResponseResult setTypeParentIds() {
// ResponseResult returnMsg = equipmentTypeService.setTypeParentIds();
// return returnMsg;
// }
//返回整棵物资树
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PublicController.java
......@@ -110,5 +110,11 @@ public class PublicController {
return ApiRes.success(publicService.addDictType(req));
}
// @PostMapping("/aaa")
// public ApiRes<String> aaa(PolicemanReq req){
//
// return String;
// }
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/TjController.java
......@@ -64,12 +64,6 @@ public class TjController {
public ApiRes<List<TjOrgEqsDto>> TjOrgEqsDetail(@RequestBody TjOrgEqsReq req){
return ApiRes.success(tjService.GetTjDataDetail(req));
}
//装备统计报表（点击+后里面的数据）
@PostMapping("/TjOrgEqsDetailPage")
@ApiOperation("/查询组织机构下的装备统计明细分页")
public ApiRes<PageResult<InventorySumDto>> TjOrgEqsDetailPage(@RequestBody TjOrgEqsReq req){
return ApiRes.success(tjService.TjOrgEqsDetailPage(req));
}
@PostMapping("/TjOrgEqsDetailList")
@ApiOperation("/查询组织机构下的装备统计明细列表")
public ApiRes<List<InventorySumDto>> TjOrgEqsDetailList(@RequestBody TjOrgEqsReq req){
......@@ -101,23 +95,25 @@ public class TjController {
}
@PostMapping("/TjOrgPriceDetail")
@ApiOperation("/查询组织机构下的财务统计明细(改)")
@ApiOperation("/查询组织机构下的财务统计明细")
public ApiRes<List<TjOrgPriceDto>> TjOrgPriceDetail(@RequestBody TjOrgPriceReq req){
return ApiRes.success(tjService.TjOrgPriceDetail(req));
}
//财务统计报表（点击+后里面的数据）
@PostMapping("/TjOrgPriceDetailPage")
@ApiOperation("/查询组织机构下的财务统计明细")
public ApiRes<PageResult<TjOrgPriceDto>> TjOrgPriceDetailPage(@RequestBody TjOrgPriceReq req){
return ApiRes.success(tjService.TjOrgPriceDetailPage(req));
@PostMapping("/TjOrgPriceDetail1")
@ApiOperation("/查询组织机构下的财务统计明细二层结构(改)")
public ApiRes<List<TjOrgPriceDto>> TjOrgPriceDetail1(@RequestBody TjOrgPriceReq req){
return ApiRes.success(tjService.TjOrgPriceDetail1(req));
}
@PostMapping("/TjOrgPriceDetailList")
@ApiOperation("/查询组织机构下的财务统计明细")
@ApiOperation("/查询组织机构下的财务统计明细(改)")
public ApiRes<List<TjOrgPriceDto>> TjOrgPriceDetailList(@RequestBody TjOrgPriceReq req){
return ApiRes.success(tjService.TjOrgPriceDetailList(req));
}
@PostMapping(path="/TjOrgPriceExport",name="财务报表导出#logType=30")
@ApiOperation("财务报表导出")
public void TjOrgPriceExport(@RequestBody TjOrgPriceReq req){
......@@ -145,26 +141,19 @@ public class TjController {
public ApiRes<List<TjOrgCountDto>> TjOrgPriceDetail(@RequestBody TjOrgCountReq req){
return ApiRes.success(tjService.TjOrgCountDetail(req));
}
//财务统计报表（点击+后里面的数据）
@PostMapping("/TjOrgCountDetailPage")
@PostMapping("/TjOrgCountDetail1")
@ApiOperation("/查询组织机构下的使用统计明细")
public ApiRes<PageResult<TjOrgCountDto>> TjOrgPriceDetailPage(@RequestBody TjOrgCountReq req){
return ApiRes.success(tjService.TjOrgCountDetailPage(req));
public ApiRes<List<TjOrgCountDto>> TjOrgPriceDetail1(@RequestBody TjOrgCountReq req){
return ApiRes.success(tjService.TjOrgCountDetail1(req));
}
@PostMapping("/TjOrgCountDetailList")
@ApiOperation("/查询组织机构下的使用统计明细")
public ApiRes<List<TjOrgCountDto>> TjOrgCountDetailList(@RequestBody TjOrgCountReq req){
return ApiRes.success(tjService.TjOrgCountDetailList(req));
}
//更新使用次数统计报表
@PostMapping("updateTjOrgCount")
@ApiOperation("更新使用次数统计报表")
public ApiRes<Boolean> updateTjOrgCount(@RequestBody TjOrgCountReq req){
return ApiRes.success(tjService.updateTjOrgCount(req));
}
//首页使用柱状图
@PostMapping("/TjOrgCountByType")
@ApiOperation("九大类使用统计柱状图")
......@@ -199,12 +188,6 @@ public class TjController {
return ApiRes.success(tjService.TjOrgPoliceSum(req));
}
//人员统计报表（点击+后里面的数据）
// @PostMapping("/TjOrgPoliceDetailPage")
// @ApiOperation("/查询组织机构下的人员统计明细")
// public ApiRes<PageResult<TjOrgPoliceDto>> TjOrgPoliceDetailPage(@RequestBody TjOrgPoliceReq req){
// return ApiRes.success(tjService.TjOrgPoliceDetailPage(req));
// }
@PostMapping("/TjOrgPoliceDetailList")
@ApiOperation("/查询组织机构下的人员统计明细")
public ApiRes<List<TjOrgPoliceDto>> TjOrgPoliceDetailList(@RequestBody TjOrgPoliceReq req){
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/BussinessInventory.java
......@@ -183,7 +183,7 @@ public class BussinessInventory implements Serializable {
private List<BussinessDetail> detailList;
@TableField(value = "api", exist = false)
private String API;
private String api;
private static final long serialVersionUID = 1L;
......
jyzb-biz/src/main/java/com/junmp/jyzb/listener/GlobalEndListener.java
......@@ -185,7 +185,7 @@ import static com.junmp.junmpProcess.common.CommonConstants.*;
BussinessInventory BI = bussinessInventoryService.getOne(new LambdaQueryWrapper<BussinessInventory>()
.eq(BussinessInventory::getProcessId, processInstanceId));
BI.setExamineState("finished");
BI.setAPI("BussinessInventory");
BI.setApi("BussinessInventory");
bussinessInventoryService.updateById(BI);
MQ.SendMsg(exchangeName,BI.getOrgId().toString(),BI);
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/EquipmentCountSummaryMapper.java
......@@ -17,7 +17,7 @@ import java.util.List;
*/
public interface EquipmentCountSummaryMapper extends BaseMapper<EquipmentCountSummary> {
void addInfo(@Param("sql") String sql);
TjOrgCountDto TjOrgCount(@Param("orgId") String orgId,
@Param("typeIdsList") List<String> typeIdsList,
......@@ -25,12 +25,12 @@ public interface EquipmentCountSummaryMapper extends BaseMapper<EquipmentCountSu
@Param("year")Integer year,
@Param("typeParentId")String typeParentId,
@Param("monthList") List<Integer> monthList);
List<TjOrgCountDto> TjOrgCount1(@Param("orgId") String orgId,
@Param("typeIdsList") List<String> typeIdsList,
@Param("sizeNameList") List<String> sizeNameList,
@Param("year")Integer year,
@Param("typeParentId")String typeParentId,
@Param("monthList") List<Integer> monthList);
// List<TjOrgCountDto> TjOrgCount1(@Param("orgId") String orgId,
// @Param("typeIdsList") List<String> typeIdsList,
// @Param("sizeNameList") List<String> sizeNameList,
// @Param("year")Integer year,
// @Param("typeParentId")String typeParentId,
// @Param("monthList") List<Integer> monthList);
TjOrgCountDto TjOrgCountleve4(@Param("orgId") Long orgId,
@Param("typeIdsList") List<String> typeIdsList,
@Param("sizeNameList") List<String> sizeNameList,
......@@ -53,26 +53,35 @@ public interface EquipmentCountSummaryMapper extends BaseMapper<EquipmentCountSu
@Param("typeParentId")String typeParentId,
@Param("monthList") List<Integer> monthList,
@Param("levelNum")Integer levelNum,
@Param("level")Integer level,@Param("column")String column,@Param("order")String order);
FinalTjOrgCountDto TjOrgCountSum(@Param("orgId") Long orgId,
@Param("sizeNameList") List<String> sizeNameList,
@Param("level")Integer level,
@Param("column")String column,
@Param("order")String order);
List<TjOrgCountDto> TjOrgCountTotalDetail(@Param("orgId") Long orgId,
@Param("typeIdsList") List<String> typeIdsList,
@Param("year")Integer year);
int TjOrgCountDetailSum(@Param("orgId")Long orgId,
@Param("sizeNameList") List<String> sizeNameList,
@Param("year") Integer year,
@Param("typeParentId")String typeParentId,
@Param("monthList") List<Integer> monthList,
@Param("levelNum")Integer levelNum,
@Param("level")Integer level,
@Param("column")String column,
@Param("order")String order);
List<TjOrgCountDto> TjOrgCountDetail(@Param("orgId") Long orgId,
@Param("typeIdsList") List<String> typeIdsList,
@Param("sizeNameList") List<String> sizeNameList);
List<TjOrgCountDto> TjOrgCountDetail(@Param("orgId")Long orgId,
@Param("sizeNameList") List<String> sizeNameList,
@Param("year") Integer year,
@Param("typeIdsList") List<String> typeIdsList,
@Param("typeParentId")String typeParentId,
@Param("monthList") List<Integer> monthList,
@Param("levelNum")Integer levelNum,
@Param("level")Integer level,
@Param("column")String column,
@Param("order")String order);
FinalTjOrgCountDto TjOrgCountSum(@Param("orgId") Long orgId,
@Param("sizeNameList") List<String> sizeNameList,
@Param("pageNo")Long pageNo, @Param("pageSize") Long pageSize);
@Param("typeIdsList") List<String> typeIdsList,
@Param("year")Integer year);
void deleteAll(@Param("orgId") Long orgId);
List<TjOrgCountDto> TjOrgCountByType(@Param("req") TjOrgCountReq req);
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/EquipmentTypeMapper.java
......@@ -18,7 +18,7 @@ public interface EquipmentTypeMapper extends BaseMapper<EquipmentType> {
void setTypeParentIds();
void setTypeParentIds(@Param("typeId")String typeId);
List<String> selectByItems(@Param("list1") List<String> list1,
@Param("list2") List<String> list2,
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/InventorySummaryMapper.java
......@@ -70,12 +70,9 @@ public interface InventorySummaryMapper extends BaseMapper<InventorySummary> {
//获取合计
FinalTjOrgEqsDto getSumByViewOrgeqsSum();
int TjOrgEqsDetailSum(@Param("orgId") Long orgId,
@Param("typeIdsList") List<String> typeIdsList,
@Param("sizeNameList") List<String> sizeNameList);
List<InventorySumDto> TjOrgEqsDetail(@Param("orgId") Long orgId, @Param("typeIdsList") List<String> typeIdsList,
@Param("sizeNameList") List<String> sizeNameList,
@Param("pageNo")Long pageNo, @Param("pageSize") Long pageSize);
@Param("column")String column, @Param("order") String order);
List<InventorySumDto> selectTotalNum(@Param("orgId") Long orgId,@Param("list") List<Object[]> searchCriteria );
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/PriceSumSummaryMapper.java
......@@ -20,20 +20,14 @@ public interface PriceSumSummaryMapper extends BaseMapper<PriceSumSummary> {
@Param("typeIdsList") List<String> typeIdsList,
@Param("sizeNameList")List<String> sizeNameList);
List<TjOrgPriceDto> TjOrgPriceDetail(@Param("orgId") Long orgId,
@Param("year") Integer year,
@Param("typeIdsList")List<String> typeIdsList,
@Param("typeIdsList") List<String> typeIdsList,
@Param("sizeNameList") List<String> sizeNameList,
@Param("pageNo")Long pageNo, @Param("pageSize") Long pageSize);
int TjOrgPriceDetailSum(@Param("orgId") Long orgId,
@Param("year") Integer year,
@Param("typeIdsList")List<String> typeIdsList,
@Param("sizeNameList") List<String> sizeNameList);
// FinalTjOrgPriceDto TjOrgPriceSum(@Param("orgId") Long orgId,@Param("year") Integer year,
// @Param("typeIdsList") List<String> typeIdsList,
// @Param("sizeNameList") List<String> sizeNameList);
@Param("column") String column,
@Param("order") String order);
void setSizeName(@Param("sizeId") String id, @Param("sizeName") String name);
......@@ -44,11 +38,7 @@ public interface PriceSumSummaryMapper extends BaseMapper<PriceSumSummary> {
@Param("typeIdsList") List<String> typeIdsList,
@Param("sizeNameList")List<String> sizeNameList,
@Param("levelFlag")Integer levelFlag);
// TjOrgPriceDto TjOrgPriceLeve4(@Param("orgId") Long orgId,
// @Param("year") Integer year,
// @Param("typeIdsList") List<String> typeIdsList,
// @Param("sizeNameList")List<String> sizeNameList,
// @Param("levelFlag")Integer levelFlag);
TjOrgPriceDto TjOrgPriceBySelf(@Param("orgId") Long orgId,
......@@ -61,10 +51,14 @@ public interface PriceSumSummaryMapper extends BaseMapper<PriceSumSummary> {
@Param("sizeNameList")List<String> sizeNameList,
@Param("levelNum")Integer levelNum,
@Param("level")Integer level);
// List<TjOrgPriceDto> TjOrgPriceTotalNum(@Param("orgId") Long orgId,
// @Param("year") Integer year,
// @Param("typeIdsList") List<String> typeIdsList,
// @Param("sizeNameList")List<String> sizeNameList,
// @Param("levelNum")Integer levelNum);
List<TjOrgPriceDto> getTotalPriceDetail(@Param("orgId") Long orgId,
@Param("year") Integer year,
@Param("typeIdsList") List<String> typeIdsList,
@Param("sizeNameList") List<String> sizeNameList,
@Param("levelNum") Integer levelNum,
@Param("level") Integer level,
@Param("column") String column,
@Param("order") String order);
}
jyzb-biz/src/main/java/com/junmp/jyzb/rabbitmq/OutInLogsReceiver.java
......@@ -32,7 +32,7 @@ public class OutInLogsReceiver {
*/
@Resource
private LogRecordApi logRecordApi;
@RabbitListener(queues = "orderResult")//监听队列名
@RabbitListener(queues = "11111")//监听队列名
private void a(String msg, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag){
LogRecordDto logRecordDTO = LogRecordFactory.createLogRecord(LogConstant.LOG_DEFAULT_NAME, "CabinetLogsRecord");
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/EquipmentTypeService.java
......@@ -25,7 +25,7 @@ public interface EquipmentTypeService extends IService<EquipmentType> {
List<EquipmentTypeDto> getEquipmentList(QueryEquipmentTypeReq req);
EquipmentTypeDto getEquipment(QueryEquipmentTypeReq req );
List<EquipmentTypeDto> getLowType(QueryEquipmentTypeReq orgId);
ResponseResult setTypeParentIds();
// ResponseResult setTypeParentIds();
ESTypeDto getTypeTreeByEs(QueryEquipmentTypeReq req) throws IOException;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/TjService.java
......@@ -20,16 +20,17 @@ public interface TjService {
//装备统计报表
PageResult<TjOrgEqsDto> GetTjData(TjOrgEqsReq req);
PageResult<InventorySumDto> TjOrgEqsDetailPage(TjOrgEqsReq req);
List<InventorySumDto> TjOrgEqsDetailList(TjOrgEqsReq req);
//财务统计报表
PageResult<TjOrgPriceDto> TjOrgPrice(TjOrgPriceReq req);
PageResult<TjOrgPriceDto> TjOrgPriceDetailPage(TjOrgPriceReq req);
List<TjOrgPriceDto> TjOrgPriceDetailList(TjOrgPriceReq req);
FinalTjOrgPriceDto TjOrgPriceSum(TjOrgPriceReq req);
List<TjOrgPriceDto> TjOrgPriceDetail(TjOrgPriceReq req);
List<TjOrgPriceDto> TjOrgPriceDetail1(TjOrgPriceReq req);
PageResult<TjOrgCountDto> TjOrgCount(TjOrgCountReq req);
......@@ -37,11 +38,9 @@ public interface TjService {
List<TjOrgCountDto> TjOrgCountDetail(TjOrgCountReq req);
PageResult<TjOrgCountDto> TjOrgCountDetailPage(TjOrgCountReq req);
List<TjOrgCountDto> TjOrgCountDetail1(TjOrgCountReq req);
List<TjOrgCountDto> TjOrgCountDetailList(TjOrgCountReq req);
boolean updateTjOrgCount(TjOrgCountReq req);
List<TjOrgCountDto> TjOrgCountByType(TjOrgCountReq req);
......@@ -71,4 +70,5 @@ public interface TjService {
void TjOrgPoliceExport(TjOrgPoliceReq req);
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentTypeServiceImpl.java
......@@ -142,7 +142,7 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
type.setUpdateTime(DateTimeUtil.getCurrentDateTime());
this.save(type);
//更新parent_ids字段
equipmentTypeMapper.setTypeParentIds();
equipmentTypeMapper.setTypeParentIds(type.getId());
String exchangeName="topicExchange";
MQDto mqDto = new MQDto();
......@@ -335,12 +335,12 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
return count > 0;
}
@Override
public ResponseResult setTypeParentIds() {
//更新parent_ids字段
equipmentTypeMapper.setTypeParentIds();
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS);
}
// @Override
// public ResponseResult setTypeParentIds() {
// //更新parent_ids字段
// equipmentTypeMapper.setTypeParentIds();
// return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS);
// }
public ESTypeDto getTypeTreeByEs(QueryEquipmentTypeReq req) throws IOException {
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java
......@@ -346,6 +346,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
return list;
}
//销毁装备申请之后将库存信息删除
public boolean addOrRevokeAgentDestructionNum(UpdateOrderReq req){
List<UpdateOrderDetailReq> list = req.getDetailList();
List<Object[]> searchItem=new ArrayList<>();
......@@ -450,17 +451,8 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
//纪录日志
private boolean addOrderLog(UpdateOrderReq req,String orderId,String orderCode,String s){
// LoginUser StartUser= LoginContext.getContext().getLoginUser();
// StartUser.
//判断日志中是否存在，如果存在直接替换
OrderLog createOrder = orderLogService.getOne(new LambdaQueryWrapper<OrderLog>()
.eq(OrderLog::getOrderId, req.getId())
.eq(OrderLog::getProcessType, "createOrder"));
//我要的是detail的明细存入到history—msg中
boolean a=true;
s=s.substring(0,s.length()-1);
if (createOrder==null){
OrderLog orderLog = new OrderLog();
orderLog.setId(UUID.randomUUID().toString());
orderLog.setHistoryMsg(s);
......@@ -472,7 +464,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
}else {
orderLog.setCreateUser(req.getEndOrgUserName());
}
orderLog.setProcessType("careteOrder");
orderLog.setProcessType("createOrder");
if (req.getOrderType().equals("in")){
orderLog.setOrgId(req.getEndOrgId());
orderLog.setOrgName(req.getEndOrgName());
......@@ -482,13 +474,8 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
}
orderLog.setOrderId(orderId);
orderLog.setCreateTime(DateTimeUtil.getCurrentDateTime());
a=orderLogService.save(orderLog);
}else{//直接替换
createOrder.setHistoryMsg(s);
createOrder.setUpdateTime(DateTimeUtil.getCurrentDateTime());
a=orderLogService.updateById(createOrder);
}
return a;
return orderLogService.save(orderLog);
}
//修改业务单据可用次数
private OrderMain setBusFormState(UpdateOrderReq req,OrderMain one,Long orgId){
......
jyzb-biz/src/main/resources/mapper/EquipmentTypeMapper.xml
......@@ -21,24 +21,27 @@
<update id="setTypeParentIds" parameterType="java.util.Map">
UPDATE base_equipment_type t1
SET t1.parent_ids = (
WITH RECURSIVE ParentHierarchy AS (
SELECT id, parent_id
FROM base_equipment_type
WHERE id = t1.id
WHERE id = #{typeId}
UNION
SELECT t2.id, t2.parent_id
SELECT t.id, t.parent_id
FROM ParentHierarchy ph
JOIN base_equipment_type t2 ON ph.parent_id = t2.id
JOIN base_equipment_type t ON ph.parent_id = t.id
)
SELECT IFNULL(GROUP_CONCAT(
UPDATE base_equipment_type t1
JOIN (
SELECT id, IFNULL(GROUP_CONCAT(
CASE WHEN parent_id != '00000000-0000-0000-0000-000000000000' THEN parent_id END
ORDER BY parent_id SEPARATOR ','), '')
ORDER BY parent_id SEPARATOR ','), '') AS parent_ids
FROM ParentHierarchy
)
GROUP BY id
) t2 ON t1.id = t2.id
SET t1.parent_ids = t2.parent_ids
WHERE t1.parent_id IS NOT NULL;
</update>
<select id="selectByItems" resultType="java.lang.String">
......
jyzb-biz/src/main/resources/mapper/InventorySummaryMapper.xml
......@@ -583,10 +583,13 @@
type_name,
size_name,
size_id
<if test="column != null and column != '' and order != null and order != '' ">
order by ${column} ${order}
</if>
<if test="column == null and order == null">
ORDER BY type_id
<if test="pageNo != null and pageNo != '' and pageSize != null and pageSize != '' ">
limit #{pageNo},#{pageSize}
</if>
</select>
<select id="selectTotalNum" resultType="com.junmp.jyzb.api.bean.dto.InventorySumDto">
......@@ -598,45 +601,7 @@
WHERE org_id_int = #{orgId} and (type_id = ${item[0]} AND size_id = '${item[1]}')
</foreach>
</select>
<select id="TjOrgEqsDetailSum" resultType="java.lang.Integer">
select count(*) from (
SELECT
type_name,
size_name,
type_id,
(
sum( CASE WHEN `base_inventory_summary`.`location_type` = 0 THEN `base_inventory_summary`.`stock_number` ELSE 0 END ) +
sum( CASE WHEN `base_inventory_summary`.`location_type` = 0 THEN `base_inventory_summary`.`outbound_number` ELSE 0 END ) +
sum( CASE WHEN `base_inventory_summary`.`location_type` = 0 THEN `base_inventory_summary`.`destruction_number` ELSE 0 END )
) AS total_number,
sum( CASE WHEN ( `base_inventory_summary`.`location_type` = 0 ) THEN `base_inventory_summary`.`stock_number` ELSE 0 END ) AS `ck_stock_number`,
sum( CASE WHEN ( `base_inventory_summary`.`location_type` = 0 ) THEN `base_inventory_summary`.`outbound_number` ELSE 0 END ) AS `ck_outbound_number`,
sum( CASE WHEN ( `base_inventory_summary`.`location_type` = 0 ) THEN `base_inventory_summary`.`destruction_number` ELSE 0 END ) AS `destruction_number`,
sum( CASE WHEN ( `base_inventory_summary`.`location_type` = 1 ) THEN `base_inventory_summary`.`stock_number` ELSE 0 END ) AS `djg_stock_number`,
sum( CASE WHEN ( `base_inventory_summary`.`location_type` = 1 ) THEN `base_inventory_summary`.`outbound_number` ELSE 0 END ) AS `djg_outbound_number`
FROM
base_inventory_summary
WHERE
org_id_int = #{orgId}
<if test="typeIdsList!=null and typeIdsList.size() > 0">
AND type_id IN
<foreach collection="typeIdsList " item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="sizeNameList!=null and sizeNameList.size() > 0">
AND
<foreach collection="sizeNameList " item="item" open="(" separator="or" close=")">
size_name like CONCAT('%', #{item}, '%')
</foreach>
</if>
GROUP BY
type_id,
type_name,
size_name
ORDER BY type_id
) as t
</select>
<select id="GetEquipmentSummarySum" resultType="java.lang.Integer"
parameterType="com.junmp.jyzb.api.bean.query.InventorySumReq">
select count(*) from (
......
jyzb-boot/src/main/resources/application-local.yml
......@@ -36,9 +36,9 @@ knife4j:
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.3.121:3306/db_jyzb?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
url: jdbc:mysql://192.168.1.128:3306/db_jyzb?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
username: root
password: junmp123
password: 123456
redis:
#host: 192.168.3.188
......
jyzb-boot/src/main/resources/application-prod.yml
......@@ -32,9 +32,9 @@ knife4j:
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.3.121:3306/db_jyzb?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
url: jdbc:mysql://192.168.1.128:3306/db_jyzb?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
username: root
password: junmp123
password: 123456
redis:
#host: 192.168.3.188
......
jyzb-process/src/main/java/com/junmp/junmpProcess/mapper/QuickSuggestionsMapper.java
......@@ -2,6 +2,7 @@ package com.junmp.junmpProcess.mapper;
import com.junmp.junmpProcess.entity.QuickSuggestions;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.junmp.jyzb.api.bean.query.QueryOrderLogReq;
import com.junmp.jyzb.api.bean.req.InventorySummaryReq;
import com.junmp.jyzb.api.bean.req.UpdateBusFormReq;
import com.junmp.jyzb.api.bean.req.UpdateOrderDetailReq;
......@@ -32,6 +33,8 @@ public interface QuickSuggestionsMapper extends BaseMapper<QuickSuggestions> {
List<UpdateOrderDetailReq> getOrderMainDetail(@Param("processId")String processInstanceId);
boolean updateDesNum(@Param("list") List<InventorySummaryReq> inventorySummaryList);
Boolean addOrderLog(@Param("req") QueryOrderLogReq orderLog);
}
......
jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowTaskServiceImpl.java
......@@ -30,10 +30,12 @@ import com.junmp.junmpProcess.service.IFlowInstanceService;
import com.junmp.junmpProcess.service.IFlowTaskService;
import com.junmp.junmpProcess.service.Repository.ProcessTemplateService;
import com.junmp.junmpProcess.utils.CreateNullData;
import com.junmp.junmpProcess.utils.DateTimeUtil;
import com.junmp.junmpProcess.vo.*;
import com.junmp.jyzb.api.bean.dto.BusFormDto;
import com.junmp.jyzb.api.bean.dto.PolicemanDto;
import com.junmp.jyzb.api.bean.query.BussinessOrderDetialReq;
import com.junmp.jyzb.api.bean.query.QueryOrderLogReq;
import com.junmp.jyzb.api.bean.req.InventorySummaryReq;
import com.junmp.jyzb.api.bean.req.UpdateBusFormReq;
import com.junmp.jyzb.api.bean.req.UpdateOrderDetailReq;
......@@ -365,6 +367,9 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
break;
}
//将拒绝的单子创建日志
addOrderLog(StartUser,comments);
}else {
runtimeService.deleteProcessInstance(taskId, "拒绝");
}
......@@ -373,6 +378,16 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS,ReturnMsg.PASS);
}
private Boolean addOrderLog(SysUser sysUser,String comments){
QueryOrderLogReq orderLog = new QueryOrderLogReq();
orderLog.setId(UUID.randomUUID().toString());
orderLog.setHistoryMsg(StringUtils.isNotBlank(comments)?comments:"拒绝");
orderLog.setCreateUser(sysUser.getAccount());
orderLog.setProcessType("refuseOrder");
orderLog.setCreateTime(DateTimeUtil.getCurrentDateTime());
return quickSuggestionsMapper.addOrderLog(orderLog);
}
@Override
public ResponseResult revoke(HandleDataDTO handleDataDTO) {
SysUser StartUser=new SysUser();
......
jyzb-process/src/main/resources/mapper/QuickSuggestionsMapper.xml
......@@ -16,6 +16,10 @@
id,user_id,text,
create_time,update_time
</sql>
<insert id="addOrderLog">
insert into bussiness_order_log(id,history_msg,create_time,create_user,process_type)
values(#{req.id},#{req.historyMsg},#{req.createTime},#{req.createUser},#{req.processType})
</insert>
<update id="updateOrderMain" parameterType="java.lang.String">
update bussiness_order_main om
set om.examine_state ="refuse" where om.process_id =#{processId}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论