更改

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/OneExcelInfo.java

@@ -43,6 +43,8 @@ public class OneExcelInfo {
     private String onceSuppRemark;
     //调整说明
     private String adjustmentRemarks;
+    //备注
+    private String remarks;
     //是否调整
     private String isAdjustment;
     //调整金额

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/OneExcelVo.java

@@ -43,4 +43,6 @@ public class OneExcelVo {
     private String onceSuppRemark;
     @ExportEntityMap(CnName = "调整说明", EnName = "adjustmentRemarks")
     private String adjustmentRemarks;
+    @ExportEntityMap(CnName = "备注", EnName = "remarks")
+    private String remarks;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/TwoExcelInfo.java

@@ -48,6 +48,8 @@ public class TwoExcelInfo {
     private String secondSuppRemark;
     //调整说明
     private String adjustmentRemarks;
+    //备注
+    private String remarks;
     //是否调整
     private String isAdjustment;
     //调整金额

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/TwoExcelVo.java

@@ -49,4 +49,6 @@ public class TwoExcelVo {
     private String secondSuppRemark;
     @ExportEntityMap(CnName = "调整说明", EnName = "adjustmentRemarks")
     private String adjustmentRemarks;
+    @ExportEntityMap(CnName = "备注", EnName = "remarks")
+    private String remarks;
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java

@@ -1110,7 +1110,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
             return rb.fail().setMsg("上传文件不正确");
         }
 
-        int[] resultCell = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
+        int[] resultCell = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
         boolean isExcel2003 = true;
         if (fileName.matches("^.+\\.(?i)(xlsx)$")) {
             isExcel2003 = false;
@@ -1157,8 +1157,8 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
             }
             OneExcelInfo importVo = new OneExcelInfo();
             int physicalNumberOfCells = row.getPhysicalNumberOfCells();
-            if (physicalNumberOfCells < 8) {
-                physicalNumberOfCells = 8;
+            if (physicalNumberOfCells < 17) {
+                physicalNumberOfCells = 17;
             }
             for (int i = 0; i < physicalNumberOfCells; i++) {
                 String trim = new String();
@@ -1219,6 +1219,9 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                                 case 15:
                                     importVo.setAdjustmentRemarks(temp);
                                     break;
+                                case 16:
+                                    importVo.setRemarks(temp);
+                                    break;
                                 default:
                                     break;
                             }
@@ -1278,6 +1281,9 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                             case 15:
                                 word = "调整说明";
                                 break;
+                            case 16:
+                                word = "备注";
+                                break;
                             default:
                                 break;
                         }
@@ -1289,7 +1295,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         }
         if (!importVoList.isEmpty()) {
             for (OneExcelInfo excelInfo : importVoList) {
-                ScmSpecialRebateVo scmSpecialRebateVo = baseMapper.selectExcelInfo(createOrgSid, excelInfo.getRebateTypeValue(), excelInfo.getRebateName(), excelInfo.getEstimateRebate(), excelInfo.getPalceGenDate(), excelInfo.getPurchaseSystemName(), excelInfo.getBrandName());
+                ScmSpecialRebateVo scmSpecialRebateVo = baseMapper.selectExcel(createOrgSid, excelInfo.getRebateTypeValue(), excelInfo.getRebateName(), excelInfo.getEstimateRebate(), excelInfo.getPalceGenDate(), excelInfo.getPurchaseSystemName(), excelInfo.getBrandName(), excelInfo.getRemarks());
                 if (scmSpecialRebateVo == null || StringUtils.isBlank(scmSpecialRebateVo.getSid())) {
                     checkWord.add("返利名称" + excelInfo.getRebateName() + "导入的返利信息不存在");
                     break;
@@ -1565,7 +1571,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
             return rb.fail().setMsg("上传文件不正确");
         }
 
-        int[] resultCell = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18};
+        int[] resultCell = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19};
         boolean isExcel2003 = true;
         if (fileName.matches("^.+\\.(?i)(xlsx)$")) {
             isExcel2003 = false;
@@ -1612,8 +1618,8 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
             }
             TwoExcelInfo importVo = new TwoExcelInfo();
             int physicalNumberOfCells = row.getPhysicalNumberOfCells();
-            if (physicalNumberOfCells < 8) {
-                physicalNumberOfCells = 8;
+            if (physicalNumberOfCells < 20) {
+                physicalNumberOfCells = 20;
             }
             for (int i = 0; i < physicalNumberOfCells; i++) {
                 String trim = new String();

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

@@ -26,18 +26,16 @@
 package com.yxt.anrui.oa.biz.adfeteapply;
 
 import com.yxt.anrui.oa.biz.adfetedetail.AdFeteListDetailVo;
-import com.yxt.common.core.vo.Vo;
-
+import com.yxt.anrui.oa.biz.oaform.OaFormCommonVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
 import java.util.ArrayList;
 import java.util.List;
 
 @Data
 @ApiModel(value = "商务宴请事前申请 视图数据详情", description = "商务宴请事前申请 视图数据详情")
-public class AdFeteApplyDetailsVo implements Vo {
+public class AdFeteApplyDetailsVo extends OaFormCommonVo {
 
     @ApiModelProperty("备注")
     private String remarks;

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.yxt.anrui.oa.biz.adfeteapply.AdFeteApplyMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-    <select id="details" resultType="com.yxt.anrui.oa.biz.adfeteapply.AdFeteApplyDetailsVo">
+    <select id="details" resultMap="detailMap">
         select remarks, sid
         from ad_fete_apply
         where sid = #{sid}

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

@@ -26,7 +26,7 @@
 package com.yxt.anrui.oa.biz.adfrockallotapply;
 
 import com.yxt.anrui.oa.biz.adfrockallotdetail.AdFrockallotListDetailVo;
-import com.yxt.common.core.vo.Vo;
+import com.yxt.anrui.oa.biz.oaform.OaFormCommonVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -35,7 +35,7 @@ import java.util.List;
 
 @Data
 @ApiModel(value = "工装订制配发申请 视图数据详情", description = "工装订制配发申请 视图数据详情")
-public class AdFrockallotApplyDetailsVo implements Vo {
+public class AdFrockallotApplyDetailsVo extends OaFormCommonVo {
 
     @ApiModelProperty("备注")
     private String remarks;

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.yxt.anrui.oa.biz.adfrockallotapply.AdFrockallotApplyMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-    <select id="details" resultType="com.yxt.anrui.oa.biz.adfrockallotapply.AdFrockallotApplyDetailsVo">
+    <select id="details" resultMap="detailMap">
         select remarks, sid
         from ad_frockallot_apply
         where sid = #{sid}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupdocumentsapply/AdGroupDocumentsApplyMapper.xml

@@ -9,6 +9,7 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
     <select id="details" resultType="com.yxt.anrui.oa.biz.adgroupdocumentsapply.AdGroupDocumentsApplyVo">
         select *
         from ad_group_documentsapply_apply

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

@@ -9,6 +9,7 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
     <select id="details" resultType="com.yxt.anrui.oa.biz.adgroupsystemapply.AdGroupSystemApplyVo">
         select *
         from ad_group_system_apply

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

@@ -25,34 +25,17 @@
  *********************************************************/
 package com.yxt.anrui.oa.biz.adleasehostapply;
 
-
-import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesListDetailVo;
 import com.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostListDetailVo;
-import com.yxt.common.core.vo.Vo;
-
+import com.yxt.anrui.oa.biz.oaform.OaFormCommonVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Project: yxt-oa(宿舍租赁) <br/>
- * File: AdLeasehostApplyVo.java <br/>
- * Class: com.yxt.anrui.oa.api.adleasehostapply.AdLeasehostApplyVo <br/>
- * Description: 宿舍租赁申请 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-02-17 14:11:50 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "宿舍租赁申请 视图数据详情", description = "宿舍租赁申请 视图数据详情")
-public class AdLeasehostApplyDetailsVo implements Vo {
+public class AdLeasehostApplyDetailsVo extends OaFormCommonVo {
 
     @ApiModelProperty("备注")
     private String remarks;

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.yxt.anrui.oa.biz.adleasehostapply.AdLeasehostApplyMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-    <select id="details" resultType="com.yxt.anrui.oa.biz.adleasehostapply.AdLeasehostApplyDetailsVo">
+    <select id="details" resultMap="detailMap">
         select remarks, sid
         from ad_leasehost_apply
         where sid = #{sid}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApplyDetailsVo.java

@@ -26,18 +26,16 @@
 package com.yxt.anrui.oa.biz.adnoexpatriateshostelapply;
 
 import com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail.AdNoexpatriatesHostelListDetailVo;
-import com.yxt.common.core.vo.Vo;
-
+import com.yxt.anrui.oa.biz.oaform.OaFormCommonVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
 import java.util.ArrayList;
 import java.util.List;
 
 @Data
 @ApiModel(value = "非驻外人员申请宿舍申请 视图数据详情", description = "非驻外人员申请宿舍申请 视图数据详情")
-public class AdNoexpatriatesHostelApplyDetailsVo implements Vo {
+public class AdNoexpatriatesHostelApplyDetailsVo extends OaFormCommonVo {
 
     @ApiModelProperty("备注")
     private String remarks;

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApplyMapper.xml

@@ -4,8 +4,7 @@
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 
-    <select id="details"
-            resultType="com.yxt.anrui.oa.biz.adnoexpatriateshostelapply.AdNoexpatriatesHostelApplyDetailsVo">
+    <select id="details" resultMap="detailMap">
         select sid,
                remarks
         from ad_noexpatriates_hostel_apply

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

@@ -25,22 +25,17 @@
  *********************************************************/
 package com.yxt.anrui.oa.biz.adoffspaceapply;
 
-
-import com.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostListDetailVo;
 import com.yxt.anrui.oa.biz.adoffspacedetail.AdOffspaceListDetailVo;
-import com.yxt.common.core.vo.Vo;
-
+import com.yxt.anrui.oa.biz.oaform.OaFormCommonVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
 import java.util.ArrayList;
 import java.util.List;
 
-
 @Data
 @ApiModel(value = "办公场地租赁申请 视图数据详情", description = "办公场地租赁申请 视图数据详情")
-public class AdOffspaceApplyDetailsVo implements Vo {
+public class AdOffspaceApplyDetailsVo extends OaFormCommonVo {
 
     @ApiModelProperty("备注")
     private String remarks;

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

@@ -4,7 +4,7 @@
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 
-    <select id="details" resultType="com.yxt.anrui.oa.biz.adoffspaceapply.AdOffspaceApplyDetailsVo">
+    <select id="details" resultMap="detailMap">
         select remarks, sid
         from ad_offspace_apply
         where sid = #{sid}

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

@@ -25,33 +25,17 @@
  *********************************************************/
 package com.yxt.anrui.oa.biz.adpircarpulapply;
 
-
 import com.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostListDetailVo;
-import com.yxt.common.core.vo.Vo;
-
+import com.yxt.anrui.oa.biz.oaform.OaFormCommonVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Project: yxt-oa(私车临时公用) <br/>
- * File: AdPircarpulApplyVo.java <br/>
- * Class: com.yxt.anrui.oa.api.adpircarpulapply.AdPircarpulApplyVo <br/>
- * Description: 临时私车公用申请 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-02-20 09:42:01 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "临时私车公用申请 视图数据详情", description = "临时私车公用申请 视图数据详情")
-public class AdPircarpulApplyDetailsVo implements Vo {
+public class AdPircarpulApplyDetailsVo extends OaFormCommonVo {
 
     @ApiModelProperty("备注")
     private String remarks;

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.yxt.anrui.oa.biz.adpircarpulapply.AdPircarpulApplyMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-    <select id="details" resultType="com.yxt.anrui.oa.biz.adpircarpulapply.AdPircarpulApplyDetailsVo">
+    <select id="details" resultMap="detailMap">
         select remarks, sid
         from ad_pircarpul_apply
         where sid = #{sid}

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

@@ -25,34 +25,17 @@
  *********************************************************/
 package com.yxt.anrui.oa.biz.adsenpircarpulapply;
 
-
-import com.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostListDetailVo;
 import com.yxt.anrui.oa.biz.adsenpircarpuldetail.AdSenpircarpulListDetailVo;
-import com.yxt.common.core.vo.Vo;
-
+import com.yxt.anrui.oa.biz.oaform.OaFormCommonVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Project: yxt-oa(1) <br/>
- * File: AdSenpircarpulApplyVo.java <br/>
- * Class: com.yxt.anrui.oa.api.adsenpircarpulapply.AdSenpircarpulApplyVo <br/>
- * Description: 总经理级固定私车公用申请 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-02-20 11:28:22 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "总经理级固定私车公用申请 视图数据详情", description = "总经理级固定私车公用申请 视图数据详情")
-public class AdSenpircarpulApplyDetailsVo implements Vo {
+public class AdSenpircarpulApplyDetailsVo extends OaFormCommonVo {
 
     @ApiModelProperty("备注")
     private String remarks;

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.yxt.anrui.oa.biz.adsenpircarpulapply.AdSenpircarpulApplyMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-    <select id="details" resultType="com.yxt.anrui.oa.biz.adsenpircarpulapply.AdSenpircarpulApplyDetailsVo">
+    <select id="details" resultMap="detailMap">
         select remarks, sid
         from ad_pircarpul_apply
         where sid = #{sid}