Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@@ -472,7 +472,6 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
             formVariables.put("isAdj", i);
         }
         if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) {
-            bv.setOrgSidPath(baseAccadjApply.getOrgSidPath());
             ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());
@@ -828,11 +827,12 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                     nextNodeUserSids.append(sid).append(",");
                 }
             }
-            if (StringUtils.isBlank(nextNodeUserSids)) {
-                return rb.setMsg("下一环节暂无操作人员");
+            if (StringUtils.isBlank(nextNodeUserSids)){
+                bv.setNextNodeUserSids("");
+            }else {
+                String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
+                bv.setNextNodeUserSids(substring);
             }
-            String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
-            bv.setNextNodeUserSids(substring);
         }
         if (baseAccadjApply.getAccadjTypeValue().equals("调出")) {
             String callInOrgSid = baseAccadjApply.getCallInOrgSid();
@@ -852,12 +852,15 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                         nextNodeUserSids.append(sid).append(",");
                     }
                 }
-                String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
-                bv.setNextNodeUserSids(substring);
+                if (StringUtils.isBlank(nextNodeUserSids)){
+                    bv.setNextNodeUserSids("");
+                }else {
+                    String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
+                    bv.setNextNodeUserSids(substring);
+                }
             }
         }
         if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) {
-            bv.setOrgSidPath(baseAccadjApply.getOrgSidPath());
             ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());
@@ -920,11 +923,12 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                 nextNodeUserSids.append(sid).append(",");
             }
         }
-        if (StringUtils.isBlank(nextNodeUserSids)) {
-            return rb.setMsg("下一环节暂无操作人员");
+        if (StringUtils.isBlank(nextNodeUserSids)){
+            bv.setNextNodeUserSids("");
+        }else {
+            String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
+            bv.setNextNodeUserSids(substring);
         }
-        String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
-        bv.setNextNodeUserSids(substring);
         if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean1 = flowFeign.handleProsess(bv);
             if (!resultBean1.getSuccess()) {

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePush.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.fin.api.fintemptimepush;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@ApiModel(value = "金蝶数据推送-临时表", description = "金蝶数据推送-临时表")
+@TableName("fin_temp_time_push")
+@Data
+public class FinTempTimePush extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty("业务sid")
+    private String busSid;
+    @ApiModelProperty("业务类型")
+    private String busType;
+
+
+
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePushDto.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.fin.api.fintemptimepush;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class FinTempTimePushDto implements Dto {
+
+    private String createBySid;
+    @ApiModelProperty("业务sid")
+    private String busSid;
+    @ApiModelProperty("业务类型")
+    private String busType;
+
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePushFeign.java

@@ -0,0 +1,23 @@
+package com.yxt.anrui.fin.api.fintemptimepush;
+
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@Api(tags = "金蝶数据推送-临时表")
+@FeignClient(
+        contextId = "anrui-fin-FinTempTimePush",
+        name = "anrui-fin",
+        path = "v1/FinTempTimePush")
+public interface FinTempTimePushFeign {
+
+    @ApiOperation("新增保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody FinTempTimePushDto dto);
+
+
+
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.java

@@ -0,0 +1,40 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.fintemptimepush;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePush;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface FinTempTimePushMapper extends BaseMapper<FinTempTimePush> {
+
+
+    List<FinTempTimePush> selListByBusType(@Param("busType") String busType);
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.xml

@@ -0,0 +1,13 @@
+<?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.yxt.anrui.fin.biz.fintemptimepush.FinTempTimePushMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+
+
+    <select id="selListByBusType" resultType="com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePush">
+        select *
+        from fin_temp_time_push
+        where busType = #{busType}
+    </select>
+</mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushRest.java

@@ -0,0 +1,48 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.fintemptimepush;
+
+import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePushDto;
+import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePushFeign;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@Api(tags = "金蝶数据推送-临时表")
+@RestController("com.yxt.anrui.fin.biz.fintemptimepush.FinTempTimePushRest")
+@RequestMapping("v1/FinTempTimePush")
+public class FinTempTimePushRest implements FinTempTimePushFeign {
+
+    @Autowired
+    private FinTempTimePushService finTempTimePushService;
+    @Override
+    public ResultBean save(FinTempTimePushDto dto) {
+        return finTempTimePushService.saveEntity(dto);
+    }
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushService.java

@@ -0,0 +1,52 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.fintemptimepush;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePush;
+import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePushDto;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class FinTempTimePushService extends MybatisBaseService<FinTempTimePushMapper, FinTempTimePush> {
+
+
+    public ResultBean saveEntity(FinTempTimePushDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        FinTempTimePush finTempTimePush = new FinTempTimePush();
+        BeanUtil.copyProperties(dto,finTempTimePush);
+        baseMapper.insert(finTempTimePush);
+        return rb.success();
+    }
+
+    public List<FinTempTimePush> selListByBusType(String busType) {
+        return baseMapper.selListByBusType(busType);
+    }
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/TimingPushService.java

@@ -0,0 +1,40 @@
+package com.yxt.anrui.fin.biz.fintemptimepush;
+
+import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePush;
+import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.LoanMonthlyAccrualApplyFeign;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/11/7 14:02
+ */
+@Component
+public class TimingPushService {
+
+    @Autowired
+    private LoanMonthlyAccrualApplyFeign loanMonthlyAccrualApplyFeign;
+    @Autowired
+    private FinTempTimePushService finTempTimePushService;
+
+    /**
+     * 定时推送月还计提凭证
+     */
+    @Scheduled(cron = "0 0 3 2,3,4,5,6,7,8,9,10 * ? ") //每月2-10号 3点推送
+    public void monthlyAccrualVoucher() {
+      List<FinTempTimePush> list = finTempTimePushService.selListByBusType("月还计提");
+      list.removeAll(Collections.singleton(null));
+      if (!list.isEmpty()) {
+          for (FinTempTimePush f : list) {
+              loanMonthlyAccrualApplyFeign.rePushVoucher(f.getBusSid());
+              finTempTimePushService.deleteBySid(f.getSid());
+          }
+      }
+
+    }
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java

@@ -1187,9 +1187,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
             newVoucher.setAccountBook(voucher.getUseOrgCode());
             newVoucher.setVoucherNo(voucher.getUseOrgCode());
         }
-        Date date = new Date();
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        String formatDate = sdf.format(date);
+        String formatDate = voucher.getBussDate();
         String[] split = formatDate.split("-");
         String month = split[1];
         int m = Integer.parseInt(month);

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReport.java

@@ -0,0 +1,152 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: baobiao(baobiao) <br/>
+ * File: AsMonthFittingsInventoryReport.java <br/>
+ * Class: com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport.AsMonthFittingsInventoryReport <br/>
+ * Description: 月度配件库存管理指标完成情况报表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-03-05 14:43:41 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "月度配件库存管理指标完成情况报表", description = "月度配件库存管理指标完成情况报表")
+@TableName("as_month_fittings_inventory_report")
+public class AsMonthFittingsInventoryReport extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("生成年月（yyyy-MM）")
+    private String createDate; // 生成年月（yyyy-MM）
+	@ApiModelProperty("事业部sid")
+    private String busOrgSid; // 事业部sid
+	@ApiModelProperty("事业部名称")
+    private String busOrgName; // 事业部名称
+	@ApiModelProperty("分公司sid")
+    private String createOrgSid; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private String createOrgName; // 分公司名称
+	@ApiModelProperty("部门（服务站）sid")
+    private String useOrgSid; // 部门（服务站）sid
+	@ApiModelProperty("部门（服务站）")
+    private String useOrgName; // 部门（服务站）
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名")
+    private String brandName; // 品牌名
+	@ApiModelProperty("品名（区域）")
+    private String zoneName; // 品名（区域）
+	@ApiModelProperty("项目（仓库）")
+    private String houseName; // 项目（仓库）
+	@ApiModelProperty("在修车辆")
+    private BigDecimal repairVehAmount; // 在修车辆
+	@ApiModelProperty("品种（个）-库存总计")
+    private BigDecimal fittingsVarietyTotal; // 品种（个）-库存总计
+	@ApiModelProperty("金额（元）-库存总计")
+    private BigDecimal fittingsAmountTotal; // 金额（元）-库存总计
+	@ApiModelProperty("品种（个）-库龄1-60天")
+    private BigDecimal fittingsVarietyOne; // 品种（个）-库龄1-60天
+	@ApiModelProperty("金额（元）-库龄1-60天")
+    private BigDecimal fittingsAmountOne; // 金额（元）-库龄1-60天
+	@ApiModelProperty("占比-库龄1-60天")
+    private BigDecimal fittingsPercentOne; // 占比-库龄1-60天
+	@ApiModelProperty("品种（个）-库龄61-90天")
+    private BigDecimal fittingsVarietyTwo; // 品种（个）-库龄61-90天
+	@ApiModelProperty("金额（元）-库龄61-90天")
+    private BigDecimal fittingsAmountTwo; // 金额（元）-库龄61-90天
+	@ApiModelProperty("占比-库龄61-90天")
+    private BigDecimal fittingsPercentTwo; // 占比-库龄61-90天
+	@ApiModelProperty("品种（个）-库龄91-180天")
+    private BigDecimal fittingsVarietyThree; // 品种（个）-库龄91-180天
+	@ApiModelProperty("金额（元）-库龄91-180天")
+    private BigDecimal fittingsAmountThree; // 金额（元）-库龄91-180天
+	@ApiModelProperty("占比-库龄91-180天")
+    private BigDecimal fittingsPercentThree; // 占比-库龄91-180天
+	@ApiModelProperty("品种（个）-库龄150-180天")
+    private BigDecimal fittingsVarietyFour; // 品种（个）-库龄150-180天
+	@ApiModelProperty("金额（元）-库龄150-180天")
+    private BigDecimal fittingsAmountFour; // 金额（元）-库龄150-180天
+	@ApiModelProperty("占比-库龄150-180天")
+    private BigDecimal fittingsPercentFour; // 占比-库龄150-180天
+	@ApiModelProperty("品种（个）-库龄181-270天")
+    private BigDecimal fittingsVarietyFive; // 品种（个）-库龄181-270天
+	@ApiModelProperty("金额（元）-库龄181-270天")
+    private BigDecimal fittingsAmountFive; // 金额（元）-库龄181-270天
+	@ApiModelProperty("占比-库龄181-270天")
+    private BigDecimal fittingsPercentFive; // 占比-库龄181-270天
+	@ApiModelProperty("品种（个）-库龄240-270天")
+    private BigDecimal fittingsVarietySix; // 品种（个）-库龄240-270天
+	@ApiModelProperty("金额（元）-库龄240-270天")
+    private BigDecimal fittingsAmountSix; // 金额（元）-库龄240-270天
+	@ApiModelProperty("占比-库龄240-270天")
+    private BigDecimal fittingsPercentSix; // 占比-库龄240-270天
+	@ApiModelProperty("品种（个）-库龄271-360天")
+    private BigDecimal fittingsVarietySeven; // 品种（个）-库龄271-360天
+	@ApiModelProperty("金额（元）-库龄271-360天")
+    private BigDecimal fittingsAmountSeven; // 金额（元）-库龄271-360天
+	@ApiModelProperty("占比-库龄271-360天")
+    private BigDecimal fittingsPercentSeven; // 占比-库龄271-360天
+	@ApiModelProperty("品种（个）-库龄330-360天")
+    private BigDecimal fittingsVarietyEight; // 品种（个）-库龄330-360天
+	@ApiModelProperty("金额（元）-库龄330-360天")
+    private BigDecimal fittingsAmountEight; // 金额（元）-库龄330-360天
+	@ApiModelProperty("占比-库龄330-360天")
+    private BigDecimal fittingsPercentEight; // 占比-库龄330-360天
+	@ApiModelProperty("品种（个）-库龄361-720天")
+    private BigDecimal fittingsVarietyNine; // 品种（个）-库龄361-720天
+	@ApiModelProperty("金额（元）-库龄361-720天")
+    private BigDecimal fittingsAmountNine; // 金额（元）-库龄361-720天
+	@ApiModelProperty("占比-库龄361-720天")
+    private BigDecimal fittingsPercentNine; // 占比-库龄361-720天
+	@ApiModelProperty("品种（个）-库龄720天以上")
+    private BigDecimal fittingsVarietyTen; // 品种（个）-库龄720天以上
+	@ApiModelProperty("金额（元）-库龄720天以上")
+    private BigDecimal fittingsAmountTen; // 金额（元）-库龄720天以上
+	@ApiModelProperty("占比-库龄720天以上")
+    private BigDecimal fittingsPercentTen; // 占比-库龄720天以上
+	@ApiModelProperty("当月出库配件成本-金额")
+    private BigDecimal fittingsOutAmount; // 当月出库配件成本-金额
+	@ApiModelProperty("当月出库配件成本-占比")
+    private BigDecimal fittingsOutPercent; // 当月出库配件成本-占比
+	@ApiModelProperty("当月入库配件成本-金额")
+    private BigDecimal fittingsInAmount; // 当月入库配件成本-金额
+	@ApiModelProperty("当月入库配件成本-占比")
+    private BigDecimal fittingsInPercent; // 当月入库配件成本-占比
+
+}

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportFeign.java

@@ -0,0 +1,74 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: baobiao(baobiao) <br/>
+ * File: AsMonthFittingsInventoryReportFeign.java <br/>
+ * Class: com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport.AsMonthFittingsInventoryReportFeign <br/>
+ * Description: 月度配件库存管理指标完成情况报表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-03-05 14:43:41 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "月度配件库存管理指标完成情况报表")
+@FeignClient(
+        contextId = "baobiao-AsMonthFittingsInventoryReport",
+        name = "baobiao",
+        path = "v1/MonthFittingsReport",
+        fallback = AsMonthFittingsInventoryReportFeignFallback.class)
+public interface AsMonthFittingsInventoryReportFeign {
+
+
+    @ApiOperation("月度配件库存管理指标完成情况列表")
+    @PostMapping("/monthFittingsList")
+    @ResponseBody
+    public ResultBean<PagerVo<MonthFittingsReportListVo>> monthFittingsList(@RequestBody PagerQuery<MonthFittingsReportListQuery> pq);
+
+    @ApiOperation("月度配件库存管理指标完成情况列表明细")
+    @PostMapping("/monthFittingsListDetails")
+    @ResponseBody
+    public ResultBean<List<AsMonthFittingsInventoryReportVo>> monthFittingsListDetails(@RequestParam("createDate") String createDate,
+                                                                                       @RequestParam("useOrgSid") String useOrgSid
+                                                                                   );
+
+
+
+}

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportFeignFallback.java

@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: baobiao(baobiao) <br/>
+ * File: AsMonthFittingsInventoryReportFeignFallback.java <br/>
+ * Class: com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport.AsMonthFittingsInventoryReportFeignFallback <br/>
+ * Description: 月度配件库存管理指标完成情况报表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-03-05 14:43:41 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class AsMonthFittingsInventoryReportFeignFallback implements AsMonthFittingsInventoryReportFeign {
+
+
+
+	@Override
+	public ResultBean<PagerVo<MonthFittingsReportListVo>> monthFittingsList(PagerQuery<MonthFittingsReportListQuery> pq) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<AsMonthFittingsInventoryReportVo>> monthFittingsListDetails(String createDate, String useOrgSid) {
+		return null;
+	}
+
+
+}

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportVo.java

@@ -0,0 +1,136 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: baobiao(baobiao) <br/>
+ * File: AsMonthFittingsInventoryReportVo.java <br/>
+ * Class: com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport.AsMonthFittingsInventoryReportVo <br/>
+ * Description: 月度配件库存管理指标完成情况报表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-03-05 14:43:41 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "月度配件库存管理指标完成情况报表 视图数据对象", description = "月度配件库存管理指标完成情况报表 视图数据对象")
+public class AsMonthFittingsInventoryReportVo implements Vo {
+
+	@ApiModelProperty("生成年月（yyyy-MM）")
+    private String createDate; // 生成年月（yyyy-MM）
+	@ApiModelProperty("品牌名")
+    private String brandName; // 品牌名
+	@ApiModelProperty("品名（区域）")
+    private String zoneName; // 品名（区域）
+	@ApiModelProperty("项目（仓库）")
+    private String houseName; // 项目（仓库）
+	@ApiModelProperty("在修车辆")
+    private String repairVehAmount; // 在修车辆
+	@ApiModelProperty("品种（个）-库存总计")
+    private String fittingsVarietyTotal; // 品种（个）-库存总计
+	@ApiModelProperty("金额（元）-库存总计")
+    private String fittingsAmountTotal; // 金额（元）-库存总计
+	@ApiModelProperty("品种（个）-库龄1-60天")
+    private String fittingsVarietyOne; // 品种（个）-库龄1-60天
+	@ApiModelProperty("金额（元）-库龄1-60天")
+    private String fittingsAmountOne; // 金额（元）-库龄1-60天
+	@ApiModelProperty("占比-库龄1-60天")
+    private String fittingsPercentOne; // 占比-库龄1-60天
+	@ApiModelProperty("品种（个）-库龄61-90天")
+    private String fittingsVarietyTwo; // 品种（个）-库龄61-90天
+	@ApiModelProperty("金额（元）-库龄61-90天")
+    private String fittingsAmountTwo; // 金额（元）-库龄61-90天
+	@ApiModelProperty("占比-库龄61-90天")
+    private String fittingsPercentTwo; // 占比-库龄61-90天
+	@ApiModelProperty("品种（个）-库龄91-180天")
+    private String fittingsVarietyThree; // 品种（个）-库龄91-180天
+	@ApiModelProperty("金额（元）-库龄91-180天")
+    private String fittingsAmountThree; // 金额（元）-库龄91-180天
+	@ApiModelProperty("占比-库龄91-180天")
+    private String fittingsPercentThree; // 占比-库龄91-180天
+	@ApiModelProperty("品种（个）-库龄150-180天")
+    private String fittingsVarietyFour; // 品种（个）-库龄150-180天
+	@ApiModelProperty("金额（元）-库龄150-180天")
+    private String fittingsAmountFour; // 金额（元）-库龄150-180天
+	@ApiModelProperty("占比-库龄150-180天")
+    private String fittingsPercentFour; // 占比-库龄150-180天
+	@ApiModelProperty("品种（个）-库龄181-270天")
+    private String fittingsVarietyFive; // 品种（个）-库龄181-270天
+	@ApiModelProperty("金额（元）-库龄181-270天")
+    private String fittingsAmountFive; // 金额（元）-库龄181-270天
+	@ApiModelProperty("占比-库龄181-270天")
+    private String fittingsPercentFive; // 占比-库龄181-270天
+	@ApiModelProperty("品种（个）-库龄240-270天")
+    private String fittingsVarietySix; // 品种（个）-库龄240-270天
+	@ApiModelProperty("金额（元）-库龄240-270天")
+    private String fittingsAmountSix; // 金额（元）-库龄240-270天
+	@ApiModelProperty("占比-库龄240-270天")
+    private String fittingsPercentSix; // 占比-库龄240-270天
+	@ApiModelProperty("品种（个）-库龄271-360天")
+    private String fittingsVarietySeven; // 品种（个）-库龄271-360天
+	@ApiModelProperty("金额（元）-库龄271-360天")
+    private String fittingsAmountSeven; // 金额（元）-库龄271-360天
+	@ApiModelProperty("占比-库龄271-360天")
+    private String fittingsPercentSeven; // 占比-库龄271-360天
+	@ApiModelProperty("品种（个）-库龄330-360天")
+    private String fittingsVarietyEight; // 品种（个）-库龄330-360天
+	@ApiModelProperty("金额（元）-库龄330-360天")
+    private String fittingsAmountEight; // 金额（元）-库龄330-360天
+	@ApiModelProperty("占比-库龄330-360天")
+    private String fittingsPercentEight; // 占比-库龄330-360天
+	@ApiModelProperty("品种（个）-库龄361-720天")
+    private String fittingsVarietyNine; // 品种（个）-库龄361-720天
+	@ApiModelProperty("金额（元）-库龄361-720天")
+    private String fittingsAmountNine; // 金额（元）-库龄361-720天
+	@ApiModelProperty("占比-库龄361-720天")
+    private String fittingsPercentNine; // 占比-库龄361-720天
+	@ApiModelProperty("品种（个）-库龄720天以上")
+    private String fittingsVarietyTen; // 品种（个）-库龄720天以上
+	@ApiModelProperty("金额（元）-库龄720天以上")
+    private String fittingsAmountTen; // 金额（元）-库龄720天以上
+	@ApiModelProperty("占比-库龄720天以上")
+    private String fittingsPercentTen; // 占比-库龄720天以上
+	@ApiModelProperty("当月出库配件成本-金额")
+    private String fittingsOutAmount; // 当月出库配件成本-金额
+	@ApiModelProperty("当月出库配件成本-占比")
+    private String fittingsOutPercent; // 当月出库配件成本-占比
+	@ApiModelProperty("当月入库配件成本-金额")
+    private String fittingsInAmount; // 当月入库配件成本-金额
+	@ApiModelProperty("当月入库配件成本-占比")
+    private String fittingsInPercent; // 当月入库配件成本-占比
+
+}

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asmonthfittingsinventoryreport/MonthFittingsReportListQuery.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+@Data
+public class MonthFittingsReportListQuery implements Query {
+
+    private String startDate;
+    private String endDate;
+    private String useOrgName;
+
+
+}

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asmonthfittingsinventoryreport/MonthFittingsReportListVo.java

@@ -0,0 +1,12 @@
+package com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+@Data
+public class MonthFittingsReportListVo implements Vo {
+
+    private String createDate;
+    private String useOrgName;
+    private String useOrgSid;
+}

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportMapper.java

@@ -0,0 +1,71 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.reportcenter.biz.asmonthfittingsinventoryreport;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport.MonthFittingsReportListVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport.AsMonthFittingsInventoryReport;
+import com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport.AsMonthFittingsInventoryReportVo;
+
+import java.util.List;
+
+/**
+ * Project: baobiao(baobiao) <br/>
+ * File: AsMonthFittingsInventoryReportMapper.java <br/>
+ * Class: com.yxt.anrui.reportcenter.biz.asmonthfittingsinventoryreport.AsMonthFittingsInventoryReportMapper <br/>
+ * Description: 月度配件库存管理指标完成情况报表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-03-05 14:43:41 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface AsMonthFittingsInventoryReportMapper extends BaseMapper<AsMonthFittingsInventoryReport> {
+
+	//@Update("update as_month_fittings_inventory_report set name=#{msg} where id=#{id}")
+	//IPage<AsMonthFittingsInventoryReportVo> voPage(IPage<AsMonthFittingsInventoryReport> page, @Param(Constants.WRAPPER) QueryWrapper<AsMonthFittingsInventoryReport> qw);
+	
+	IPage<AsMonthFittingsInventoryReportVo> selectPageVo(IPage<AsMonthFittingsInventoryReport> page, @Param(Constants.WRAPPER) Wrapper<AsMonthFittingsInventoryReport> qw);
+	
+	List<AsMonthFittingsInventoryReportVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsMonthFittingsInventoryReport> qw);
+	
+	@Select("select * from as_month_fittings_inventory_report")
+	List<AsMonthFittingsInventoryReportVo> selectListVo();
+
+	IPage<MonthFittingsReportListVo> monthFittingsList(IPage<AsMonthFittingsInventoryReport> page, @Param(Constants.WRAPPER) QueryWrapper<AsMonthFittingsInventoryReport> qw);
+
+	List<AsMonthFittingsInventoryReportVo> monthFittingsListDetails(@Param(Constants.WRAPPER)QueryWrapper<AsMonthFittingsInventoryReport> qw);
+}

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportMapper.xml

@@ -0,0 +1,28 @@
+<?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.yxt.anrui.reportcenter.biz.asmonthfittingsinventoryreport.AsMonthFittingsInventoryReportMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport.AsMonthFittingsInventoryReportVo">
+		SELECT * FROM as_month_fittings_inventory_report <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport.AsMonthFittingsInventoryReportVo">
+		SELECT * FROM as_month_fittings_inventory_report <where> ${ew.sqlSegment} </where>
+	</select>
+	<select id="monthFittingsList"
+			resultType="com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport.MonthFittingsReportListVo">
+		SELECT
+			createDate,
+			useOrgSid,
+			useOrgName
+		FROM
+			as_month_fittings_inventory_report AS mf
+		<where> ${ew.sqlSegment} </where>
+		GROUP BY mf.createDate,mf.useOrgSid
+	</select>
+	<select id="monthFittingsListDetails"
+			resultType="com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport.AsMonthFittingsInventoryReportVo">
+		SELECT * FROM as_month_fittings_inventory_report <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportRest.java

@@ -0,0 +1,77 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.reportcenter.biz.asmonthfittingsinventoryreport;
+
+import com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport.AsMonthFittingsInventoryReportFeign;
+import com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport.AsMonthFittingsInventoryReportVo;
+import com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport.MonthFittingsReportListQuery;
+import com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport.MonthFittingsReportListVo;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * Project: baobiao(baobiao) <br/>
+ * File: AsMonthFittingsInventoryReportFeignFallback.java <br/>
+ * Class: com.yxt.anrui.reportcenter.biz.asmonthfittingsinventoryreport.AsMonthFittingsInventoryReportRest <br/>
+ * Description: 月度配件库存管理指标完成情况报表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-03-05 14:43:41 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "月度配件库存管理指标完成情况报表")
+@RestController("com.yxt.anrui.reportcenter.biz.asmonthfittingsinventoryreport.AsMonthFittingsInventoryReportRest")
+@RequestMapping("v1/MonthFittingsReport")
+public class AsMonthFittingsInventoryReportRest implements AsMonthFittingsInventoryReportFeign {
+
+	@Autowired
+	private AsMonthFittingsInventoryReportService asMonthFittingsInventoryReportService;
+
+	@Override
+	public ResultBean<PagerVo<MonthFittingsReportListVo>> monthFittingsList(PagerQuery<MonthFittingsReportListQuery> pq) {
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<MonthFittingsReportListVo> pv = asMonthFittingsInventoryReportService.monthFittingsList(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	public ResultBean<List<AsMonthFittingsInventoryReportVo>> monthFittingsListDetails(String createDate, String useOrgSid) {
+		ResultBean rb = ResultBean.fireFail();
+		List<AsMonthFittingsInventoryReportVo> pv = asMonthFittingsInventoryReportService.monthFittingsListDetails(createDate,useOrgSid);
+		return rb.success().setData(pv);
+	}
+
+}

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportService.java

@@ -0,0 +1,85 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.reportcenter.biz.asmonthfittingsinventoryreport;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport.*;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: baobiao(baobiao) <br/>
+ * File: AsMonthFittingsInventoryReportService.java <br/>
+ * Class: com.yxt.anrui.reportcenter.biz.asmonthfittingsinventoryreport.AsMonthFittingsInventoryReportService <br/>
+ * Description: 月度配件库存管理指标完成情况报表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-03-05 14:43:41 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class AsMonthFittingsInventoryReportService extends MybatisBaseService<AsMonthFittingsInventoryReportMapper, AsMonthFittingsInventoryReport> {
+
+
+    public PagerVo<MonthFittingsReportListVo> monthFittingsList(PagerQuery<MonthFittingsReportListQuery> pq) {
+        MonthFittingsReportListQuery query = pq.getParams();
+        QueryWrapper<AsMonthFittingsInventoryReport> qw = new QueryWrapper<>();
+        //生成日期开始时间
+        String createTimeStart = query.getStartDate();
+        //生成日期结束时间
+        String createTimeEnd = query.getEndDate();
+        qw.apply(StringUtils.isNotEmpty(createTimeStart), "date_format (mf.createDate,'%Y-%m') >= date_format('" + createTimeStart + "','%Y-%m')").
+                apply(StringUtils.isNotEmpty(createTimeEnd), "date_format (mf.createDate,'%Y-%m') <= date_format('" + createTimeEnd + "','%Y-%m')"
+                );
+        if (StringUtils.isNotBlank(query.getUseOrgName())) {
+            qw.like("mf.useOrgName", query.getUseOrgName());
+        }
+        IPage<AsMonthFittingsInventoryReport> page = PagerUtil.queryToPage(pq);
+        IPage<MonthFittingsReportListVo> pagging = baseMapper.monthFittingsList(page, qw);
+        PagerVo<MonthFittingsReportListVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public List<AsMonthFittingsInventoryReportVo> monthFittingsListDetails(String createDate, String useOrgSid) {
+        QueryWrapper<AsMonthFittingsInventoryReport> qw = new QueryWrapper<>();
+        qw.eq("createDate", createDate);
+        qw.eq("useOrgSid", useOrgSid);
+        List<AsMonthFittingsInventoryReportVo> list = baseMapper.monthFittingsListDetails(qw);
+        return list;
+    }
+
+
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java

@@ -15,6 +15,8 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
+import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePushDto;
+import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePushFeign;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
@@ -124,6 +126,8 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService<LoanMonth
     private MessageListFeign messageListFeign;
     @Autowired
     private LoanRepaymentScheduleService loanRepaymentScheduleService;
+    @Autowired
+    private FinTempTimePushFeign finTempTimePushFeign;
 
     public ResultBean<LoanMonthlyAccrualApplyInit> accrualInit(String orgPath) {
         ResultBean<LoanMonthlyAccrualApplyInit> rb = ResultBean.fireFail();
@@ -636,21 +640,27 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService<LoanMonth
                 LoanMonthlyAccrualApply accrualApply = fetchBySid(businessSid);
                 accrualApply.setClosingDate(new DateTime());
                 baseMapper.updateById(accrualApply);
-                try {
-                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
-                            .setNameFormat("demo-pool-%d").build();
-                    ExecutorService pool = new org.apache.tomcat.util.threads.ThreadPoolExecutor(1, 10,
-                            1000, TimeUnit.MILLISECONDS,
-                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new org.apache.tomcat.util.threads.ThreadPoolExecutor.AbortPolicy());
-                    //推送月还计提凭证数据
-                    Future future = pool.submit(() -> {
-                        pushAccrualVoucher(businessSid);
-                    });
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    log.error("推送数据失败=========================" + e.getMessage());
-                    return rb.setMsg("推送数据失败");
-                }
+                //推送金蝶保存数据临时表
+                FinTempTimePushDto finTempTimePushDto = new FinTempTimePushDto();
+                finTempTimePushDto.setCreateBySid(accrualApply.getCreateBySid());
+                finTempTimePushDto.setBusSid(businessSid);
+                finTempTimePushDto.setBusType("月还计提");
+                finTempTimePushFeign.save(finTempTimePushDto);
+//                try {
+//                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+//                            .setNameFormat("demo-pool-%d").build();
+//                    ExecutorService pool = new org.apache.tomcat.util.threads.ThreadPoolExecutor(1, 10,
+//                            1000, TimeUnit.MILLISECONDS,
+//                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new org.apache.tomcat.util.threads.ThreadPoolExecutor.AbortPolicy());
+//                    //推送月还计提凭证数据
+//                    Future future = pool.submit(() -> {
+//                        pushAccrualVoucher(businessSid);
+//                    });
+//                } catch (Exception e) {
+//                    e.printStackTrace();
+//                    log.error("推送数据失败=========================" + e.getMessage());
+//                    return rb.setMsg("推送数据失败");
+//                }
             }
             return rb.success().setData(resultBean.getData());
         } else {
@@ -659,6 +669,7 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService<LoanMonth
     }
 
     private void pushAccrualVoucher(String businessSid) {
+        LoanMonthlyAccrualApply apply = fetchBySid(businessSid);
         List<LoanMonthlyAccrualRecord> records = loanMonthlyAccrualRecordService.selByMainSid(businessSid);
         if (!records.isEmpty()) {
             int index = 1000;
@@ -669,6 +680,7 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService<LoanMonth
                 List<LoanMonthlyAccrualRecord> newList = records.subList(i, i + index);
                 if (!newList.isEmpty()) {
                     GeneralVoucher generalVoucher = new GeneralVoucher();
+                    generalVoucher.setBussDate(DateUtil.formatDate(apply.getClosingDate()));
                     List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
                     for (LoanMonthlyAccrualRecord v : newList) {
                         LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchDetails(v.getRecordSid()).getData();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.java

@@ -39,22 +39,8 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetail;
 import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo;
-
 import java.util.List;
 
-/**
- * Project: anrui-scm(单车返利核对) <br/>
- * File: ScmVehrebateCheckapplydetailMapper.java <br/>
- * Class: com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailMapper <br/>
- * Description: 单车返利核对申请表_返利列表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-08-29 16:01:01 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface ScmVehrebateCheckapplydetailMapper extends BaseMapper<ScmVehrebateCheckapplydetail> {
 

yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApply.java

@@ -28,7 +28,9 @@ package com.yxt.anrui.as.api.astechtitleapply;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yxt.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.util.Date;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -52,30 +54,30 @@ import lombok.Data;
 public class AsTechTitleApply extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-	@ApiModelProperty("单据编号")
+    @ApiModelProperty("单据编号")
     private String billNo; // 单据编号
-	@ApiModelProperty("申请人")
+    @ApiModelProperty("申请人")
     private String createByName; // 申请人
-	@ApiModelProperty("申请部门sid")
+    @ApiModelProperty("申请部门sid")
     private String deptSid; // 申请部门sid
-	@ApiModelProperty("申请部门名称")
+    @ApiModelProperty("申请部门名称")
     private String deptName; // 申请部门名称
-	@ApiModelProperty("分公司sid")
+    @ApiModelProperty("分公司sid")
     private String useOrgSid; // 分公司sid
-	@ApiModelProperty("分公司名称")
+    @ApiModelProperty("分公司名称")
     private String useOrgName; // 分公司名称
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-	@ApiModelProperty("办结日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("办结日期")
     private Date finishTime; // 办结日期
-	@ApiModelProperty("实例id")
+    @ApiModelProperty("实例id")
     private String procInstId; // 实例id
-	@ApiModelProperty("流程定义id")
+    @ApiModelProperty("流程定义id")
     private String procDefId; // 流程定义id
-	@ApiModelProperty("任务id")
+    @ApiModelProperty("任务id")
     private String taskId; // 任务id
-	@ApiModelProperty("环节id")
+    @ApiModelProperty("环节id")
     private String nodeId; // 环节id
-	@ApiModelProperty("流程状态")
+    @ApiModelProperty("流程状态")
     private String nodeState; // 流程状态
 
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleMapper.java

@@ -76,7 +76,10 @@ public interface AsTechTitleMapper extends BaseMapper<AsTechTitle> {
     void updateTech(@Param("sid") String sid, @Param("techSid") String techSid, @Param("techName") String techName);
 
     @Update("update as_tech_title set isBa = #{isBa} where sid = #{sid}")
-    void updateIsBa(@Param("sid")String sid,@Param("isBa") Integer isBa);
+    void updateIsBa(@Param("sid") String sid, @Param("isBa") Integer isBa);
 
     AsTechTitle selLikeTechSid(String techSid);
+
+    @Update("update as_tech_title set weight = #{weight} where sid = #{sid}")
+    void updateWeight(@Param("sid") String sid, @Param("weight") String weight);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleService.java

@@ -241,4 +241,8 @@ public class AsTechTitleService extends MybatisBaseService<AsTechTitleMapper, As
     public AsTechTitle selLikeTechSid(String techSid) {
         return baseMapper.selLikeTechSid(techSid);
     }
+
+    public void updateWeight(String sid, String weight) {
+        baseMapper.updateWeight(sid, weight);
+    }
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyService.java

@@ -503,6 +503,7 @@ public class AsTechTitleApplyService extends MybatisBaseService<AsTechTitleApply
                     asTechTitleService.updateTech(asTechTitleDetailDetailsVo.getTitleSid(), StringUtils.join(glTechSids, ","), StringUtils.join(glTechNames, ","));
                     asTechTitleService.updateState(asTechTitleDetailDetailsVo.getTitleSid(), "0");
                     asTechTitleService.updateIsBa(asTechTitleDetailDetailsVo.getTitleSid(), 1);
+                    asTechTitleService.updateWeight(asTechTitleDetailDetailsVo.getTitleSid(),asTechTitleDetailDetailsVo.getWeight());
                 }
             } else {
                 //极光推送

yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdSealuseApplyRest.java

@@ -0,0 +1,105 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.api;
+
+import com.yxt.anrui.oa.biz.adsealuseapply.*;
+import com.yxt.anrui.oa.biz.oaform.flowable.CompleteDto;
+import com.yxt.anrui.oa.biz.oaform.flowable.NodeQuery;
+import com.yxt.anrui.oa.biz.oaform.flowable.TaskDto;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+@Api(tags = "印章及资质证件使用申请")
+@RestController
+@RequestMapping("v1/adsealuseapply")
+public class AdSealuseApplyRest {
+
+    @Autowired
+    private AdSealuseApplyService adSealuseApplyService;
+
+    @ApiOperation("初始化（新增或修改）")
+    @GetMapping({"/getInit", "/getInit/{sid}"})
+    public ResultBean<AdSealuseApplyVo> getInit(
+            @PathVariable(value = "sid", required = false) String sid,
+            @RequestParam(value = "userSid", required = false) String userSid,
+            @RequestParam(value = "orgPath", required = false) String orgPath) {
+        ResultBean<AdSealuseApplyVo> rb = ResultBean.fireFail();
+        if (sid == null || sid.isEmpty()) {
+            // 执行新增初始化
+            if (userSid == null || orgPath == null) {
+                return rb.setMsg("userSid和orgPath不能为空");
+            }
+            return adSealuseApplyService.getSaveInit(userSid, orgPath);
+        } else {
+            // 执行修改初始化
+            return adSealuseApplyService.getUpdateInit(sid);
+        }
+    }
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody AdSealuseApplyDto dto) {
+        return adSealuseApplyService.saveOrUpdateDto(dto);
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("/details/{sid}")
+    ResultBean<AdSealuseApplyDetailsVo> details(@PathVariable("sid") String sid
+            , @RequestParam(value = "application", required = false) String application) {
+        return adSealuseApplyService.details(sid, application);
+    }
+
+    @ApiOperation("提交审批流程")
+    @PostMapping("/submit")
+    public ResultBean submit(@RequestBody AdSealuseApplyDto dto) {
+        return adSealuseApplyService.submit(dto);
+    }
+
+    @ApiOperation(value = "办理（同意）")
+    @PutMapping("/complete")
+    public ResultBean complete(@Valid @RequestBody CompleteDto dto) {
+        return adSealuseApplyService.complete(dto);
+    }
+
+    @ApiOperation(value = "驳回任务")
+    @PutMapping(value = "/reject")
+    public ResultBean reject(@Valid @RequestBody TaskDto dto) {
+        return adSealuseApplyService.reject(dto);
+    }
+
+    @ApiOperation("获取流程操作标题")
+    @GetMapping("/getFlowOperateTitle")
+    @ResponseBody
+    ResultBean<String> getFlowOperateTitle(@SpringQueryMap NodeQuery query) {
+        return adSealuseApplyService.getFlowOperateTitle(query);
+    }
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdSealuseDetailRest.java

@@ -0,0 +1,36 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.api;
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+
+@Api(tags = "印章及资质证件使用列表")
+@RestController
+@RequestMapping("v1/adsealusedetail")
+public class AdSealuseDetailRest {
+
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyService.java

@@ -74,7 +74,6 @@ public class AdExpatriatesApplyService extends MybatisBaseService<AdExpatriatesA
         if (adExpatriatesApply == null) {
             return rb.setMsg("该申请不存在");
         }
-//        adExpatriatesApplyVo.setTestPage(adExpatriatesApply.getTestPage());
         OaForm oaForm = oaFormService.fetchBySid(sid);
         adExpatriatesApplyVo.setTaskId(oaForm.getTaskId());
         adExpatriatesApplyVo.setProcInsId(oaForm.getProcInstId());

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyService.java

@@ -71,7 +71,7 @@ public class AdExpatriatesHomeApplyService extends MybatisBaseService<AdExpatria
         adExpatriatesHomeApplyVo.setCreateBySid(userSid);
         adExpatriatesHomeApplyVo.setCreateByName(sysUserVo.getName());
         List<SysStaffPostVos> staffPostVos = sysStaffPostFeign.selPostByStaffSid(sysUserVo.getStaffSid()).getData();
-        if (staffPostVos.size() > 0){
+        if (staffPostVos.size() > 0) {
             adExpatriatesHomeApplyVo.setJobKey(staffPostVos.get(0).getSid());
             adExpatriatesHomeApplyVo.setJobValue(staffPostVos.get(0).getName());
         }
@@ -99,6 +99,8 @@ public class AdExpatriatesHomeApplyService extends MybatisBaseService<AdExpatria
         BeanUtil.copyProperties(adExpatriatesHomeApply, adExpatriatesHomeApplyVo);
         adExpatriatesHomeApplyVo.setJobKey(adExpatriatesHomeApply.getPostSid());
         adExpatriatesHomeApplyVo.setJobValue(adExpatriatesHomeApply.getPostName());
+        FormCommon jobObj = FormCommon.of(adExpatriatesHomeApply.getPostSid(), adExpatriatesHomeApply.getPostName());
+        adExpatriatesHomeApplyVo.setJobObj(jobObj);
         FormCommon relationObj = FormCommon.of(adExpatriatesHomeApplyVo.getRelationKey(), adExpatriatesHomeApplyVo.getRelationValue());
         adExpatriatesHomeApplyVo.setRelationObj(relationObj);
         FormCommon homeTypeObj = FormCommon.of(adExpatriatesHomeApplyVo.getHomeTypeKey(), adExpatriatesHomeApplyVo.getHomeTypeValue());
@@ -122,9 +124,9 @@ public class AdExpatriatesHomeApplyService extends MybatisBaseService<AdExpatria
             AdExpatriatesHomeApply entity = new AdExpatriatesHomeApply();
             BeanUtil.copyProperties(dto, entity, "sid");
 
-            if ("0".equals(homeTypeKey)){
+            if ("0".equals(homeTypeKey)) {
                 dto.setBillNo("ZWRYTQXJSQ");
-            }else if ("1".equals(homeTypeKey)){
+            } else if ("1".equals(homeTypeKey)) {
                 dto.setBillNo("ZWRYJSTQSQ");
             }
             dto.setSid(entity.getSid());

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyVo.java

@@ -48,6 +48,7 @@ public class AdExpatriatesHomeApplyVo implements Vo {
     private String createByName;
 
     @ApiModelProperty("申请人岗位")
+    private FormCommon jobObj;
     private String jobKey;
     private String jobValue;
     @ApiModelProperty("上次探亲休假探亲地")

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyService.java

@@ -73,7 +73,6 @@ public class AdFeteApplyService extends MybatisBaseService<AdFeteApplyMapper, Ad
         if (adFeteApplyVo == null) {
             return rb.setMsg("该申请不存在");
         }
-//        adExpatriatesApplyVo.setTestPage(adExpatriatesApply.getTestPage());
         OaForm oaForm = oaFormService.fetchBySid(sid);
         adFeteApplyVo.setTaskId(oaForm.getTaskId());
         adFeteApplyVo.setProcInsId(oaForm.getProcInstId());

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyService.java

@@ -75,7 +75,6 @@ public class AdFrockallotApplyService extends MybatisBaseService<AdFrockallotApp
         if (adFrockallotApply == null) {
             return rb.setMsg("该申请不存在");
         }
-//        adExpatriatesApplyVo.setTestPage(adExpatriatesApply.getTestPage());
         OaForm oaForm = oaFormService.fetchBySid(sid);
         adFrockallotApplyVo.setTaskId(oaForm.getTaskId());
         adFrockallotApplyVo.setProcInsId(oaForm.getProcInstId());

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupsystemapply/AdGroupSystemApplyService.java

@@ -120,8 +120,10 @@ public class AdGroupSystemApplyService extends MybatisBaseService<AdGroupSystemA
         AdGroupSystemApplyVo.setOrgSidPath(orgSidPath);
         AdGroupSystemApplyVo.setCreateBySid(oaForm.getCreateBySid());
         BeanUtil.copyProperties(AdGroupSystemApply, AdGroupSystemApplyVo);
-        List<String> files = oaAppendixService.selectByLinkSid(sid);
+        List<String> files = oaAppendixService.selectByLinkSid(AdGroupSystemApplyVo.getSid(), "图片");
+        List<String> appes = oaAppendixService.selectByLinkSid(AdGroupSystemApplyVo.getSid(), "文件");
         AdGroupSystemApplyVo.setFiles(files);
+        AdGroupSystemApplyVo.setAppes(appes);
         AdGroupSystemApplyVo.setSid(sid);
         String approverSid = AdGroupSystemApply.getApproversSid();
         String approverName = AdGroupSystemApply.getApproversName();
@@ -132,6 +134,7 @@ public class AdGroupSystemApplyService extends MybatisBaseService<AdGroupSystemA
             FormCommon formCommon = FormCommon.of(approversSid.get(i), approversName.get(i));
             approverss.add(formCommon);
         }
+        AdGroupSystemApplyVo.setApprovers(approverss);
         String roleSids = getRoleSids();
         AdGroupSystemApplyVo.setRoleSids(roleSids);
         return rb.success().setData(AdGroupSystemApplyVo);
@@ -209,7 +212,7 @@ public class AdGroupSystemApplyService extends MybatisBaseService<AdGroupSystemA
         ResultBean rb = ResultBean.fireFail();
         ResultBean<String> stringResultBean = saveOrUpdateDto(dto);
         if (!stringResultBean.getSuccess()) {
-            return rb.setMsg(stringResultBean.getData());
+            return rb.setMsg(stringResultBean.getMsg());
         }
         String businessSid = stringResultBean.getData();
         SubmitDto submitDto = new SubmitDto();
@@ -294,8 +297,8 @@ public class AdGroupSystemApplyService extends MybatisBaseService<AdGroupSystemA
         appMap.put("recallUrl", "oa/v1/oaform/revokeProcess");
         appMap.put("signUrl", "oa/v1/oaform/delegate");
         appMap.put("transferUrl", "oa/v1/oaform/assignTask");*/
-        appMap.put(OaFormUrlEnum.GROUPSYSTEM_EDIT.getType(), OaFormUrlEnum.GROUPSYSTEM_EDIT.getUrl() + sid);
-        appMap.put(OaFormUrlEnum.GROUPSYSTEM_DETAIL.getType(), OaFormUrlEnum.GROUPSYSTEM_DETAIL.getUrl() + sid);
+        appMap.put(OaFormUrlEnum.GROUPSYSTEM_EDIT.getType(), OaFormUrlEnum.GROUPSYSTEM_EDIT.getUrl() + "?sid=" + sid);
+        appMap.put(OaFormUrlEnum.GROUPSYSTEM_DETAIL.getType(), OaFormUrlEnum.GROUPSYSTEM_DETAIL.getUrl() + "?sid=" + sid);
         appMap.put(OaFormUrlEnum.GROUPSYSTEM_FLOWOPERATEURL.getType(), OaFormUrlEnum.GROUPSYSTEM_FLOWOPERATEURL.getUrl());
         appMap.put(OaFormUrlEnum.GROUPSYSTEM_AGREEURL.getType(), OaFormUrlEnum.GROUPSYSTEM_AGREEURL.getUrl());
         appMap.put(OaFormUrlEnum.STOPURL.getType(), OaFormUrlEnum.STOPURL.getUrl());

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApplyService.java

@@ -73,7 +73,6 @@ public class AdLeasehostApplyService extends MybatisBaseService<AdLeasehostApply
 		if (adLeasehostApply == null) {
 			return rb.setMsg("该申请不存在");
 		}
-//        adExpatriatesApplyVo.setTestPage(adExpatriatesApply.getTestPage());
 		OaForm oaForm = oaFormService.fetchBySid(sid);
 		adLeasehostApplyVo.setTaskId(oaForm.getTaskId());
 		adLeasehostApplyVo.setProcInsId(oaForm.getProcInstId());

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adoffspaceapply/AdOffspaceApplyService.java

@@ -76,7 +76,6 @@ public class AdOffspaceApplyService extends MybatisBaseService<AdOffspaceApplyMa
         if (adOffspaceApply == null) {
             return rb.setMsg("该申请不存在");
         }
-//        adExpatriatesApplyVo.setTestPage(adExpatriatesApply.getTestPage());
         OaForm oaForm = oaFormService.fetchBySid(sid);
         adOffspaceApplyVo.setTaskId(oaForm.getTaskId());
         adOffspaceApplyVo.setProcInsId(oaForm.getProcInstId());

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyService.java

@@ -73,7 +73,6 @@ public class AdPircarpulApplyService extends MybatisBaseService<AdPircarpulApply
 		if (adPircarpulApply == null) {
 			return rb.setMsg("该申请不存在");
 		}
-//        adExpatriatesApplyVo.setTestPage(adExpatriatesApply.getTestPage());
 		OaForm oaForm = oaFormService.fetchBySid(sid);
 		adPircarpulApplyVo.setTaskId(oaForm.getTaskId());
 		adPircarpulApplyVo.setProcInsId(oaForm.getProcInstId());

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyService.java

@@ -74,7 +74,6 @@ public class AdSalecarpulApplyService extends MybatisBaseService<AdSalecarpulApp
 		if (adSalecarpulApply == null) {
 			return rb.setMsg("该申请不存在");
 		}
-//        adExpatriatesApplyVo.setTestPage(adExpatriatesApply.getTestPage());
 		OaForm oaForm = oaFormService.fetchBySid(sid);
 		adSalecarpulApplyVo.setTaskId(oaForm.getTaskId());
 		adSalecarpulApplyVo.setProcInsId(oaForm.getProcInstId());

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApply.java

@@ -0,0 +1,92 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adsealuseapply;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "印章及资质证件使用申请", description = "印章及资质证件使用申请")
+@TableName("ad_sealuse_apply")
+public class AdSealuseApply extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("部门sid")
+    private String deptSid; // 部门sid
+    @ApiModelProperty("部门名称")
+    private String deptName; // 部门名称
+    @ApiModelProperty("经办人sid")
+    private String userSid; // 经办人sid
+    @ApiModelProperty("经办人姓名")
+    private String userName; // 经办人姓名
+    @ApiModelProperty("使用类型key")
+    private String useTypeKey; // 使用类型key
+    @ApiModelProperty("使用类型value")
+    private String useTypeValue; // 使用类型value
+    @ApiModelProperty("使用方式key")
+    private String useWayKey; // 使用方式key
+    @ApiModelProperty("使用方式value")
+    private String useWayValue; // 使用方式value
+    @ApiModelProperty("使用情况分类key")
+    private String useSitKey; // 使用情况分类key
+    @ApiModelProperty("使用情况分类value")
+    private String useSitValue; // 使用情况分类value
+    @ApiModelProperty("资质证件类别key")
+    private String certTypeKey; // 资质证件类别key
+    @ApiModelProperty("资质证件类别value")
+    private String certTypeValue; // 资质证件类别value
+    @ApiModelProperty("印章类别key")
+    private String sealTypeKey; // 印章类别key
+    @ApiModelProperty("印章类别value")
+    private String sealTypeValue; // 印章类别value
+    @ApiModelProperty("财务数据类别key")
+    private String dataTypeKey; // 财务数据类别key
+    @ApiModelProperty("财务数据类别value")
+    private String dataTypeValue; // 财务数据类别value
+    @ApiModelProperty("外出目的地")
+    private String destination; // 外出目的地
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("预计归还时间")
+    private Date returnDate; // 预计归还时间
+    @ApiModelProperty("是否需要签字")
+    private String isSign; // 是否需要签字
+    @ApiModelProperty("需要签字人员")
+    private String signUserName; // 需要签字人员
+    @ApiModelProperty("盖章或签字文件份数")
+    private String signNum; // 盖章或签字文件份数
+    @ApiModelProperty("具体用途")
+    private String purpose; // 具体用途
+    @ApiModelProperty("基础表单sid")
+    private String formSid; // 基础表单sid
+    @ApiModelProperty("关联审批sid列表,英文逗号分隔")
+    private String linkFormSids; // 关联审批sid列表,英文逗号分隔
+
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyDetailsVo.java

@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adsealuseapply;
+
+import com.yxt.anrui.oa.biz.adsalecarpuldetail.AdSalecarpulListDetailVo;
+import com.yxt.anrui.oa.biz.oaform.OaFormCommonVo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "印章及资质证件使用申请 视图数据详情", description = "印章及资质证件使用申请 视图数据详情")
+public class AdSealuseApplyDetailsVo extends OaFormCommonVo {
+
+    @ApiModelProperty("部门")
+    private String deptValue;
+    @ApiModelProperty("经办人")
+    private String userValue;
+    @ApiModelProperty("使用类型")
+    private String useTypeValue;
+    @ApiModelProperty("使用方式")
+    private String useWayValue;
+    @ApiModelProperty("使用情况分类")
+    private String useSitValue;
+    @ApiModelProperty("资质证件类别")
+    private String certTypeValue;
+    @ApiModelProperty("印章类别")
+    private String sealTypeValue;
+    @ApiModelProperty("财务数据类别")
+    private String dataTypeValue;
+    @ApiModelProperty("外出目的地")
+    private String destination;
+    @ApiModelProperty("预计归还时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date returnDate;
+    @ApiModelProperty("是否需要签字")
+    private String isSign;
+    @ApiModelProperty("需要签字人员")
+    private String signUserName;
+    @ApiModelProperty("盖章或签字文件份数")
+    private String signNum;
+    @ApiModelProperty("具体用途")
+    private String purpose;
+    @ApiModelProperty("备注")
+    private String remarks;
+
+    @ApiModelProperty("图片")
+    private List<String> files = new ArrayList<>();
+    @ApiModelProperty("附件")
+    private List<String> appes = new ArrayList<>();
+
+    private List<AdSalecarpulListDetailVo> list = new ArrayList<>();
+
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyDto.java

@@ -0,0 +1,96 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adsealuseapply;
+
+import com.yxt.anrui.oa.biz.adsealusedetail.AdSealuseDetailDto;
+import com.yxt.anrui.oa.biz.oaform.FormCommon;
+import com.yxt.anrui.oa.biz.oaform.OaFormDto;
+import java.util.ArrayList;
+import java.util.List;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "印章及资质证件使用申请 数据传输对象", description = "印章及资质证件使用申请 数据传输对象")
+public class AdSealuseApplyDto extends OaFormDto {
+
+    @ApiModelProperty("部门")
+    private FormCommon deptObj;
+    private String deptKey;
+    private String deptValue;
+    @ApiModelProperty("经办人")
+    private FormCommon userObj;
+    private String userKey;
+    private String userValue;
+    @ApiModelProperty("使用类型")
+    private FormCommon useTypeObj;
+    private String useTypeKey;
+    private String useTypeValue;
+    @ApiModelProperty("使用方式")
+    private FormCommon useWayObj;
+    private String useWayKey;
+    private String useWayValue;
+    @ApiModelProperty("使用情况分类")
+    private FormCommon useSitObj;
+    private String useSitKey;
+    private String useSitValue;
+    @ApiModelProperty("资质证件类别")
+    private FormCommon certTypeObj;
+    private String certTypeKey;
+    private String certTypeValue;
+    @ApiModelProperty("印章类别")
+    private FormCommon sealTypObj;
+    private String sealTypKey;
+    private String sealTypeValue;
+    @ApiModelProperty("财务数据类别")
+    private FormCommon dataTypeObj;
+    private String dataTypeKey;
+    private String dataTypeValue;
+    @ApiModelProperty("外出目的地")
+    private String destination;
+    @ApiModelProperty("预计归还时间")
+    private String returnDate;
+    @ApiModelProperty("是否需要签字")
+    private String isSign;
+    @ApiModelProperty("需要签字人员")
+    private String signUserName;
+    @ApiModelProperty("盖章或签字文件份数")
+    private String signNum;
+    @ApiModelProperty("具体用途")
+    private String purpose;
+    @ApiModelProperty("基础表单sid")
+    private String formSid;
+    @ApiModelProperty("关联审批单")
+    private String linkFormSids;
+    @ApiModelProperty("图片")
+    private List<String> files = new ArrayList<>();
+    @ApiModelProperty("文件")
+    private List<String> appes = new ArrayList<>();
+
+    private List<AdSealuseDetailDto> list = new ArrayList<>();
+
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyMapper.java

@@ -0,0 +1,35 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adsealuseapply;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface AdSealuseApplyMapper extends BaseMapper<AdSealuseApply> {
+
+	AdSealuseApplyDetailsVo details(String sid);
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyMapper.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.oa.biz.adsealuseapply.AdSealuseApplyMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="details" resultMap="detailMap">
+        select remarks, sid
+        from ad_sealuse_apply
+        where sid = #{sid}
+    </select>
+
+    <resultMap id="detailMap" type="com.yxt.anrui.oa.biz.adsealuseapply.AdSealuseApplyDetailsVo">
+        <result column="remarks" property="remarks"/>
+        <collection property="list" ofType="com.yxt.anrui.oa.biz.adsealusedetail.AdSealuseListDetailVo"
+                    select="selectList" column="sid">
+        </collection>
+    </resultMap>
+
+    <select id="selectList" resultType="com.yxt.anrui.oa.biz.adsealusedetail.AdSealuseListDetailVo">
+        select sid,
+               manageCompanyName as manageCompanyValue,
+               beCompanyName as beCompanyValue
+        from ad_sealuse_detail
+        where mainSid = #{sid}
+    </select>
+</mapper>

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyService.java

@@ -0,0 +1,302 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adsealuseapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.oa.biz.adsealusedetail.AdSealuseDetailDto;
+import com.yxt.anrui.oa.biz.adsealusedetail.AdSealuseDetailService;
+import com.yxt.anrui.oa.biz.adsealusedetail.AdSealuseDetailVo;
+import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService;
+import com.yxt.anrui.oa.biz.oaform.OaForm;
+import com.yxt.anrui.oa.biz.oaform.OaFormRuleEnum;
+import com.yxt.anrui.oa.biz.oaform.OaFormService;
+import com.yxt.anrui.oa.biz.oaform.OaFormUrlEnum;
+import com.yxt.anrui.oa.biz.oaform.flowable.*;
+import com.yxt.anrui.oa.feign.file.OaFileEnum;
+import com.yxt.anrui.oa.feign.flowable.flow.ProcDefEnum;
+import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationVo;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class AdSealuseApplyService extends MybatisBaseService<AdSealuseApplyMapper, AdSealuseApply> {
+
+	@Autowired
+	private OaAppendixService oaAppendixService;
+	@Autowired
+	private OaFormService oaFormService;
+	@Autowired
+	private AdSealuseDetailService adSealuseDetailService;
+	@Autowired
+	private SysOrganizationFeign sysOrganizationFeign;
+
+	public ResultBean<AdSealuseApplyVo> getSaveInit(String userSid, String orgPath) {
+		ResultBean<AdSealuseApplyVo> rb = ResultBean.fireFail();
+		AdSealuseApplyVo adSealuseApplyVo = new AdSealuseApplyVo();
+		adSealuseApplyVo.setCreateBySid(userSid);
+		adSealuseApplyVo.setOrgSidPath(orgPath);
+		return rb.success().setData(adSealuseApplyVo);
+	}
+
+	public ResultBean<AdSealuseApplyVo> getUpdateInit(String sid) {
+		ResultBean<AdSealuseApplyVo> rb = ResultBean.fireFail();
+		AdSealuseApplyVo adSealuseApplyVo = new AdSealuseApplyVo();
+		AdSealuseApply adSealuseApply = fetchBySid(sid);
+		if (adSealuseApply == null) {
+			return rb.setMsg("该申请不存在");
+		}
+		OaForm oaForm = oaFormService.fetchBySid(sid);
+		adSealuseApplyVo.setTaskId(oaForm.getTaskId());
+		adSealuseApplyVo.setProcInsId(oaForm.getProcInstId());
+		//根据部门sid获取orgPath并赋值
+		SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(oaForm.getDeptSid()).getData();
+		String orgSidPath = organizationVo.getOrgSidPath();
+		adSealuseApplyVo.setOrgSidPath(orgSidPath);
+		adSealuseApplyVo.setCreateBySid(oaForm.getCreateBySid());
+		BeanUtil.copyProperties(adSealuseApply, adSealuseApplyVo);
+		List<AdSealuseDetailVo> list = adSealuseDetailService.getUpdateInit(sid);
+		List<String> files = oaAppendixService.selectByLinkSid(sid, "图片");
+		adSealuseApplyVo.setFiles(files);
+		List<String> appes = oaAppendixService.selectByLinkSid(sid, "文件");
+		adSealuseApplyVo.setAppes(appes);
+		adSealuseApplyVo.setList(list);
+		adSealuseApplyVo.setSid(sid);
+		return rb.success().setData(adSealuseApplyVo);
+	}
+
+	public ResultBean<String> saveOrUpdateDto(AdSealuseApplyDto dto) {
+		ResultBean<String> rb = ResultBean.fireFail();
+		String sid = dto.getSid();
+		List<String> files = dto.getFiles();
+		List<String> appes = dto.getAppes();
+		List<AdSealuseDetailDto> list = dto.getList();
+		if (StringUtils.isBlank(sid)) {
+			// 新建操作
+			AdSealuseApply entity = new AdSealuseApply();
+			BeanUtil.copyProperties(dto, entity, "sid");
+
+			dto.setBillNo("YZJZZZJSYSQ");
+			dto.setSid(entity.getSid());
+			ResultBean<String> resultBean = oaFormService.saveOaForm(dto);
+
+			if (!resultBean.getSuccess()) {
+				return rb;
+			}
+
+			entity.setFormSid(resultBean.getData());
+			baseMapper.insert(entity);
+			sid = entity.getSid();
+		} else {
+			// 更新操作
+			AdSealuseApply entity = fetchBySid(sid);
+			BeanUtil.copyProperties(dto, entity, "id", "sid");
+			baseMapper.updateById(entity);
+		}
+		adSealuseDetailService.saveDetails(list, sid);
+		// 处理附件
+		saveFiles(sid, files, OaFileEnum.ADSEALUSEAPPLY.getAttachType(), "图片");
+		saveFiles(sid, appes, OaFileEnum.ADSEALUSEAPPLY.getAttachType(), "文件");
+		return rb.success().setData(sid);
+	}
+
+	// 保存文件
+	private void saveFiles(String sid, List<String> files, String attachType, String fileType) {
+		files.removeAll(Collections.singleton(null));
+		oaAppendixService.saveFile(sid, files, attachType, fileType);
+	}
+
+	public ResultBean<AdSealuseApplyDetailsVo> details(String sid, String application) {
+		ResultBean rb = ResultBean.fireFail();
+		AdSealuseApplyDetailsVo adSealuseApplyDetailsVo = baseMapper.details(sid);
+		if (adSealuseApplyDetailsVo == null) {
+			return rb.setMsg("该申请不存在");
+		}
+		List<String> files = oaAppendixService.selectByLinkSid(sid, "图片");
+		List<String> appes = oaAppendixService.selectByLinkSid(sid, "文件");
+		adSealuseApplyDetailsVo.setFiles(files);
+		adSealuseApplyDetailsVo.setAppes(appes);
+		//基础字段赋值
+		BeanUtil.copyProperties(oaFormService.getDetails(sid), adSealuseApplyDetailsVo);
+		return rb.success().setData(adSealuseApplyDetailsVo);
+	}
+
+	/**
+	 * 提交
+	 *
+	 * @param dto
+	 * @return
+	 */
+	public ResultBean submit(AdSealuseApplyDto dto) {
+		ResultBean rb = ResultBean.fireFail();
+		ResultBean<String> stringResultBean = saveOrUpdateDto(dto);
+		if (!stringResultBean.getSuccess()) {
+			return rb.setMsg(stringResultBean.getData());
+		}
+		String businessSid = stringResultBean.getData();
+
+		SubmitDto submitDto = new SubmitDto();
+		submitDto.setUserSid(dto.getCreateBySid());
+		submitDto.setBusinessSid(businessSid);
+
+		Map<String, Object> formVariables = new HashMap<>();
+		formVariables = getMap(formVariables, businessSid);
+		submitDto.setFormVariables(formVariables);
+		submitDto.setProcDefId(ProcDefEnum.HIHIREAPPLY.getProDefId());
+		submitDto.setNextTaskId(dto.getTaskId());
+		submitDto.setRule(OaFormRuleEnum.DIRECTLY_UNDER.getRule());
+		return oaFormService.submit(submitDto);
+	}
+
+	/**
+	 * 办理（同意）
+	 *
+	 * @param dto
+	 * @return
+	 */
+	public ResultBean complete(CompleteDto dto) {
+		Map<String, Object> formVariables = dto.getFormVariables();
+		formVariables = getMap(formVariables, dto.getBusinessSid());
+		dto.setFormVariables(formVariables);
+		BusinessVariablesDto businessVariablesDto = new BusinessVariablesDto();
+		BeanUtil.copyProperties(dto, businessVariablesDto);
+		return oaFormService.complete(businessVariablesDto);
+	}
+
+	/**
+	 * 驳回
+	 *
+	 * @param dto
+	 * @return
+	 */
+	public ResultBean reject(TaskDto dto) {
+		Map<String, Object> formVariables = dto.getFormVariables();
+		formVariables = getMap(formVariables, dto.getBusinessSid());
+		dto.setFormVariables(formVariables);
+		return oaFormService.reject(dto);
+	}
+
+	public ResultBean<String> getFlowOperateTitle(NodeQuery query) {
+		// 默认失败返回
+		ResultBean<String> rb = ResultBean.fireFail();
+
+		// 获取next值和formVariables
+		int next = query.getNext();
+
+		// 获取并更新formVariables
+		Map<String, Object> formVariables = getMap(query.getFormVariables(), query.getBusinessSid());
+		query.setFormVariables(formVariables);
+
+		// 校验next参数是否有效（只允许0或1）
+		if (next != 0 && next != 1) {
+			return rb.setMsg("参数错误：next"); // 如果next不是0或1，返回错误信息
+		}
+
+		// 获取节点名称
+		String data = getNodeName(query, next);
+
+		// 如果data为null，表示未获取到有效的节点信息
+		if (data == null) {
+			return rb.setMsg("没有获取到节点信息"); // 返回错误消息
+		}
+
+		// 返回成功的结果和获取到的节点名称
+		return rb.success().setData(data);
+	}
+
+	/**
+	 * 网关参数组成
+	 *
+	 * @param formVariables
+	 * @param sid
+	 * @return
+	 */
+	public Map<String, Object> getMap(Map<String, Object> formVariables, String sid) {
+		Map<String, Object> appMap = new HashMap<>();
+		appMap.put("sid", sid);
+        /*appMap.put("editUrl", "approval/#/pages/EditOnboradingApplyActivity?sid=" + sid);
+        appMap.put("detailUrl", "approval/#/pages/DetailOnboradingApplyActivity?sid=" + sid);
+        appMap.put("flowOperateUrl", "oa/v1/HrHireApply/getFlowOperateTitle");
+        appMap.put("agreeUrl", "oa/v1/HrHireApply/complete");
+        appMap.put("stopUrl", "oa/v1/oaform/breakProcess");
+        appMap.put("rejectUrl", "oa/v1/HrHireApply/reject");
+        appMap.put("recallUrl", "oa/v1/oaform/revokeProcess");
+        appMap.put("signUrl", "oa/v1/oaform/delegate");
+        appMap.put("transferUrl", "oa/v1/oaform/assignTask");*/
+		appMap.put(OaFormUrlEnum.HRHIREAPPLY_EDIT.getType(), OaFormUrlEnum.HRHIREAPPLY_EDIT.getUrl() + "?sid=" + sid);
+		appMap.put(OaFormUrlEnum.HRHIREAPPLY_DETAIL.getType(), OaFormUrlEnum.HRHIREAPPLY_DETAIL.getUrl() + "?sid=" + sid);
+		appMap.put(OaFormUrlEnum.HRHIREAPPLY_FLOWOPERATEURL.getType(), OaFormUrlEnum.HRHIREAPPLY_FLOWOPERATEURL.getUrl());
+		appMap.put(OaFormUrlEnum.HRHIREAPPLY_AGREEURL.getType(), OaFormUrlEnum.HRHIREAPPLY_AGREEURL.getUrl());
+		appMap.put(OaFormUrlEnum.STOPURL.getType(), OaFormUrlEnum.STOPURL.getUrl());
+		appMap.put(OaFormUrlEnum.HRHIREAPPLY_REJECTURL.getType(), OaFormUrlEnum.HRHIREAPPLY_REJECTURL.getUrl());
+		appMap.put(OaFormUrlEnum.RECALLURL.getType(), OaFormUrlEnum.RECALLURL.getUrl());
+		appMap.put(OaFormUrlEnum.SIGNURL.getType(), OaFormUrlEnum.SIGNURL.getUrl());
+		appMap.put(OaFormUrlEnum.TRANSFERURL.getType(), OaFormUrlEnum.TRANSFERURL.getUrl());
+		formVariables.put("app", appMap);
+		//根据组织查询是否是分公司
+		OaForm oaForm = oaFormService.fetchBySid(sid);
+		AdSealuseApply adSealuseApply = fetchBySid(sid);
+		SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(oaForm.getUseOrgSid()).getData();
+		//是否是分公司
+		formVariables.put("isTrue", sysOrganization.getIsDept() == 0);
+		return formVariables;
+	}
+
+	/**
+	 * 根据next的值获取前一个节点或下一个节点的名称。
+	 *
+	 * @param query 包含查询所需参数的NodeQuery对象
+	 * @param next  参数，0表示上一环节，1表示下一环节
+	 * @return 节点名称，如果失败则返回null
+	 */
+	private String getNodeName(NodeQuery query, int next) {
+		// 根据next值选择相应的服务方法获取节点信息
+		ResultBean<List<NodeVo>> resultBean = (next == 0)
+				? oaFormService.getPreviousNodesForReject(query)  // 获取上一环节的节点
+				: oaFormService.getNextNodesForSubmit(query);     // 获取下一环节的节点
+		// 如果服务调用成功
+		if (resultBean.getSuccess()) {
+			// 清除结果列表中的null值，避免空节点
+			resultBean.getData().removeAll(Collections.singleton(null));
+			// 如果结果列表非空，返回第一个节点的名称
+			if (!resultBean.getData().isEmpty()) {
+				return resultBean.getData().get(0).getName();
+			}
+		} else {
+			// 如果服务调用失败，返回null
+			return null;
+		}
+		// 如果结果为空，返回null
+		return null;
+	}
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyVo.java

@@ -0,0 +1,105 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adsealuseapply;
+
+import com.yxt.anrui.oa.biz.adsealusedetail.AdSealuseDetailVo;
+import com.yxt.anrui.oa.biz.oaform.FormCommon;
+import com.yxt.common.core.vo.Vo;
+import java.util.ArrayList;
+import java.util.List;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "印章及资质证件使用申请 视图数据对象", description = "印章及资质证件使用申请 视图数据对象")
+public class AdSealuseApplyVo implements Vo {
+
+    private String sid;
+    /*  private String userSid;
+      private String orgPath;*/
+    private String orgSidPath;
+    private String createBySid;
+
+    @ApiModelProperty("部门")
+    private FormCommon deptObj;
+    private String deptKey;
+    private String deptValue;
+    @ApiModelProperty("经办人")
+    private FormCommon userObj;
+    private String userKey;
+    private String userValue;
+    @ApiModelProperty("使用类型")
+    private FormCommon useTypeObj;
+    private String useTypeKey;
+    private String useTypeValue;
+    @ApiModelProperty("使用方式")
+    private FormCommon useWayObj;
+    private String useWayKey;
+    private String useWayValue;
+    @ApiModelProperty("使用情况分类")
+    private FormCommon useSitObj;
+    private String useSitKey;
+    private String useSitValue;
+    @ApiModelProperty("资质证件类别")
+    private FormCommon certTypeObj;
+    private String certTypeKey;
+    private String certTypeValue;
+    @ApiModelProperty("印章类别")
+    private FormCommon sealTypObj;
+    private String sealTypKey;
+    private String sealTypeValue;
+    @ApiModelProperty("财务数据类别")
+    private FormCommon dataTypeObj;
+    private String dataTypeKey;
+    private String dataTypeValue;
+    @ApiModelProperty("外出目的地")
+    private String destination;
+    @ApiModelProperty("预计归还时间")
+    private String returnDate;
+    @ApiModelProperty("是否需要签字")
+    private String isSign;
+    @ApiModelProperty("需要签字人员")
+    private String signUserName;
+    @ApiModelProperty("盖章或签字文件份数")
+    private String signNum;
+    @ApiModelProperty("具体用途")
+    private String purpose;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("图片")
+    private List<String> files = new ArrayList<>();
+    @ApiModelProperty("附件")
+    private List<String> appes = new ArrayList<>();
+
+    private List<AdSealuseDetailVo> list = new ArrayList<>();
+
+    private String taskId;
+    @ApiModelProperty("流程实例id")
+    private String procInsId;
+
+//    private String testPage;
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetail.java

@@ -0,0 +1,50 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adsealusedetail;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "印章及资质证件使用列表", description = "印章及资质证件使用列表")
+@TableName("ad_sealuse_detail")
+public class AdSealuseDetail extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("申请sid")
+    private String mainSid; // 申请sid
+    @ApiModelProperty("管理公司sid")
+    private String manageCompanySid; // 管理公司sid
+    @ApiModelProperty("管理公司名称")
+    private String manageCompanyName; // 管理公司名称
+    @ApiModelProperty("所属公司sid")
+    private String beCompanySid; // 所属公司sid
+    @ApiModelProperty("所属公司名称")
+    private String beCompanyName; // 所属公司名称
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailDto.java

@@ -0,0 +1,46 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adsealusedetail;
+
+import com.yxt.anrui.oa.biz.oaform.FormCommon;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "印章及资质证件使用列表 数据传输对象", description = "印章及资质证件使用列表 数据传输对象")
+public class AdSealuseDetailDto implements Dto {
+
+    @ApiModelProperty("管理公司名称")
+    private FormCommon manageCompanyObj;
+    private String manageCompanyKey;
+    private String manageCompanyValue;
+    @ApiModelProperty("所属公司名称")
+    private FormCommon beCompanyObj;
+    private String beCompanyKey;
+    private String beCompanyValue;
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailMapper.java

@@ -0,0 +1,40 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adsealusedetail;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+import java.util.List;
+
+@Mapper
+public interface AdSealuseDetailMapper extends BaseMapper<AdSealuseDetail> {
+
+	List<AdSealuseDetailVo> getUpdateInit(String sid);
+
+	@Select("select * from ad_sealuse_detail where mainSid = #{mainSid}")
+	List<AdSealuseDetail> selectByMainSid(String mainSid);
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailMapper.xml

@@ -0,0 +1,15 @@
+<?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.yxt.anrui.oa.biz.adsealusedetail.AdSealuseDetailMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="getUpdateInit" resultType="com.yxt.anrui.oa.biz.adsealusedetail.AdSealuseDetailVo">
+        select sid,
+               manageCompanySid  as manageCompanyKey,
+               manageCompanyName as manageCompanyValue,
+               beCompanySid      as beCompanyKey,
+               beCompanyName     as beCompanyValue
+        from ad_sealuse_detail
+        where mainSid = #{sid}
+    </select>
+</mapper>

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailService.java

@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adsealusedetail;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.stereotype.Service;
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class AdSealuseDetailService extends MybatisBaseService<AdSealuseDetailMapper, AdSealuseDetail> {
+
+	public void saveDetails(List<AdSealuseDetailDto> list, String sid) {
+		//根据sid查询明细并删除
+		List<AdSealuseDetail> list2 = baseMapper.selectByMainSid(sid);
+		list2.removeAll(Collections.singleton(null));
+		if (!list2.isEmpty()) {
+			list2.stream().forEach(v -> {
+				deleteBySid(v.getSid());
+			});
+		}
+		list.removeAll(Collections.singleton(null));
+		if (!list.isEmpty()) {
+			list.stream().forEach(details -> {
+				AdSealuseDetail adSealuseDetail = new AdSealuseDetail();
+				BeanUtil.copyProperties(details, adSealuseDetail);
+				adSealuseDetail.setManageCompanySid(details.getManageCompanyKey());
+				adSealuseDetail.setManageCompanyName(details.getManageCompanyValue());
+				adSealuseDetail.setBeCompanySid(details.getBeCompanyKey());
+				adSealuseDetail.setBeCompanyName(details.getBeCompanyValue());
+				adSealuseDetail.setMainSid(sid);
+				baseMapper.insert(adSealuseDetail);
+			});
+		}
+	}
+
+	public List<AdSealuseDetailVo> getUpdateInit(String sid) {
+		return baseMapper.getUpdateInit(sid);
+	}
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailVo.java

@@ -0,0 +1,48 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adsealusedetail;
+
+import com.yxt.anrui.oa.biz.oaform.FormCommon;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "印章及资质证件使用列表 视图数据对象", description = "印章及资质证件使用列表 视图数据对象")
+public class AdSealuseDetailVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("管理公司名称")
+    private FormCommon manageCompanyObj;
+    private String manageCompanyKey;
+    private String manageCompanyName;
+    @ApiModelProperty("所属公司名称")
+    private FormCommon beCompanyObj;
+    private String beCompanyKey;
+    private String beCompanyValue;
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseListDetailVo.java

@@ -0,0 +1,43 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adsealusedetail;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "印章及资质证件使用列表 视图数据对象", description = "印章及资质证件使用列表 视图数据对象")
+public class AdSealuseListDetailVo implements Vo {
+
+    private String sid;
+
+    @ApiModelProperty("管理公司名称")
+    private String manageCompanyName;
+    @ApiModelProperty("所属公司名称")
+    private String beCompanyValue;
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatapply/AdSeatApplyService.java

@@ -77,7 +77,6 @@ public class AdSeatApplyService extends MybatisBaseService<AdSeatApplyMapper, Ad
 		if (adSeatApply == null) {
 			return rb.setMsg("该申请不存在");
 		}
-//        adExpatriatesApplyVo.setTestPage(adExpatriatesApply.getTestPage());
 		OaForm oaForm = oaFormService.fetchBySid(sid);
 		adSeatApplyVo.setTaskId(oaForm.getTaskId());
 		adSeatApplyVo.setProcInsId(oaForm.getProcInstId());

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpulapply/AdSenpircarpulApplyService.java

@@ -75,7 +75,6 @@ public class AdSenpircarpulApplyService extends MybatisBaseService<AdSenpircarpu
 		if (adSenpircarpulApply == null) {
 			return rb.setMsg("该申请不存在");
 		}
-//        adExpatriatesApplyVo.setTestPage(adExpatriatesApply.getTestPage());
 		OaForm oaForm = oaFormService.fetchBySid(sid);
 		adSenpircarpulApplyVo.setTaskId(oaForm.getTaskId());
 		adSenpircarpulApplyVo.setProcInsId(oaForm.getProcInstId());

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adteamapply/AdTeamApplyService.java

@@ -72,7 +72,6 @@ public class AdTeamApplyService extends MybatisBaseService<AdTeamApplyMapper, Ad
 		if (adTeamApplyVo == null) {
 			return rb.setMsg("该申请不存在");
 		}
-//        adExpatriatesApplyVo.setTestPage(adExpatriatesApply.getTestPage());
 		OaForm oaForm = oaFormService.fetchBySid(sid);
 		adTeamApplyVo.setTaskId(oaForm.getTaskId());
 		adTeamApplyVo.setProcInsId(oaForm.getProcInstId());

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java

@@ -89,7 +89,7 @@ public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> {
         // 创建OA表单对象
         OaForm oaForm = new OaForm();
         // 将DTO中部分属性复制到oaForm中，忽略不需要的字段（如billNo, orgSidPath）
-        BeanUtil.copyProperties(dto, oaForm, "billNo", "orgSidPath");
+        BeanUtil.copyProperties(dto, oaForm, "billNo", "orgSidPath", "title", "remarks");
         try {
             String orgSidPath = dto.getOrgSidPath();
             // 获取组织信息，根据orgSidPath字段调用外部服务
@@ -213,7 +213,7 @@ public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> {
         if (!businessVariablesResultBean.getSuccess()) {
             return rb.setMsg(businessVariablesResultBean.getMsg());
         }
-        BeanUtil.copyProperties(businessVariablesResultBean.getData(), bv, "taskDefKey", "taskId");
+        BeanUtil.copyProperties(businessVariablesResultBean.getData(), bv, "taskDefKey", "taskId", "comment");
         bv.setInstanceId(oaForm.getProcInstId());
         if (oaForm.getTaskId().contains(bv.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flow3Feign.handleProsess(bv);

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormUrlEnum.java

@@ -34,11 +34,11 @@ public enum OaFormUrlEnum {
     /**
      * 集团制度会签详情
      */
-    GROUPSYSTEM_DETAIL(InnerEnum.rejectUrl.printValue(), "approval/#/pages/oa/DetailGroupSystemApplyActivity"),
+    GROUPSYSTEM_DETAIL(InnerEnum.detailUrl.printValue(), "approval/#/pages/oa/DetailGroupSystemApplyActivity"),
     /**
      * 集团制度会签修改
      */
-    GROUPSYSTEM_EDIT(InnerEnum.rejectUrl.printValue(), "approval/#/pages/oa/EditGroupSystemApplyActivity"),
+    GROUPSYSTEM_EDIT(InnerEnum.editUrl.printValue(), "approval/#/pages/oa/EditGroupSystemApplyActivity"),
 
     /**
      * 获取操作标题接口地址

yxt-oa/src/main/java/com/yxt/anrui/oa/feign/file/OaFileEnum.java

@@ -27,6 +27,7 @@ public enum OaFileEnum {
     ADTEAMAPPLY("018", "团建附件"),
     ADSEATAPPLY("019", "乘坐交通工具特殊坐席附件"),
     ADFEESREIMBURSABLEAPPLY("020", "行政类费用报销附件"),
+    ADSEALUSEAPPLY("021", "印章及资质证件使用附件"),
     ;