箱码幅面bug

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/vo/result/QrRepertorySelectDetailVO.java

@@ -17,7 +17,7 @@ public class QrRepertorySelectDetailVO {
     private Long repertoryId;
 
     @ApiModelProperty("码库列ID")
-    private Long repertoryColumnId;
+    private Long qrRepertoryColumnId;
 
     @ApiModelProperty("列数")
     private Integer sortNumber;

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/SaveBoxCodeFormatReq.java

@@ -60,9 +60,6 @@ public class SaveBoxCodeFormatReq implements Serializable {
     @ApiModel(value = "SaveBoxCodeFormatReq_SplitBean")
     public static class SplitBean implements Serializable {
 
-        @ApiModelProperty("拆分数量id")
-        private Long Id;
-
         @ApiModelProperty("码库id")
         private Long repertoryId;
 
@@ -72,6 +69,9 @@ public class SaveBoxCodeFormatReq implements Serializable {
         @ApiModelProperty(value = "拆分数量")
         private Integer splitNum;
 
+        @ApiModelProperty(value = "拆分id")
+        private Long splitId;
+
     }
 
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListQrRepertorySelectDetailRes.java

@@ -36,7 +36,7 @@ public class ListQrRepertorySelectDetailRes implements Serializable {
         private Long repertoryId;
 
         @ApiModelProperty("码库列ID")
-        private Long repertoryColumnId;
+        private Long qrRepertoryColumnId;
 
         @ApiModelProperty("列数")
         private Integer sortNumber;
@@ -44,12 +44,5 @@ public class ListQrRepertorySelectDetailRes implements Serializable {
         @ApiModelProperty("别名")
         private String alias;
 
-        @ApiModelProperty("拆分数量")
-        private Integer splitNum;
-
-        @ApiModelProperty("拆分数量id")
-        private Long splitId;
-
-
     }
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/infrastructure/util/UserUtil.java

@@ -58,10 +58,9 @@ public class UserUtil {
         }
         //查询用户数据
         UserInfo wholeUser = userInfoMapper.selectById(USER_THREAD_LOCAL.get().getId());
-
         //查询其他数据
         UserRoleDetail roleDetail = roleManagerService.getRoleDetail(wholeUser.getRoleCode());
-        int isMainAccount = (TrueFalseEnum.TRUE.is(roleDetail.getIsActivateMiniAppMainAccount()))?1:0;
+        int isMainAccount = (roleDetail!=null && TrueFalseEnum.TRUE.is(roleDetail.getIsActivateMiniAppMainAccount()))?1:0;
 
         //转为userBean
         UserBean userBean = PojoConverterUtils.copy(wholeUser, UserBean.class);

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrBoxCodeFormatImpl.java

@@ -90,8 +90,8 @@ public class QrBoxCodeFormatImpl implements QrBoxCodeFormatService {
         for (SaveBoxCodeFormatReq.SplitBean splitReq : splitBeanList) {
             //声明对象
             QrBoxCodeFormatSplit split = null;
-            if (splitReq.getId() != null) {
-                split = qrBoxCodeFormatSplitMapper.selectById(splitReq.getId());
+            if (splitReq.getSplitId() != null) {
+                split = qrBoxCodeFormatSplitMapper.selectById(splitReq.getSplitId());
                 AssertUtil.isNull(split, "拆分数量ID不存在");
             } else {
                 split = new QrBoxCodeFormatSplit();
@@ -102,13 +102,13 @@ public class QrBoxCodeFormatImpl implements QrBoxCodeFormatService {
             split.setSplitNum(splitReq.getSplitNum());
             split.setQrRepertoryId(splitReq.getRepertoryId());
 
-            if (splitReq.getId() != null) {
-                //先删除再新增
-                qrBoxCodeFormatSplitMapper.deleteBySplitId(splitReq.getId());
-                qrBoxCodeFormatSplitMapper.insert(split);
-            } else {
+            //修改or新增
+            if (splitReq.getSplitId() != null) {
+                qrBoxCodeFormatSplitMapper.updateById(split);
+            }else{
                 qrBoxCodeFormatSplitMapper.insert(split);
             }
+
         }
 
     }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrRepertoryServiceImpl.java

@@ -276,11 +276,14 @@ public class QrRepertoryServiceImpl implements QrRepertoryService {
     @Override
     public ListQrRepertorySelectDetailRes listQrRepertorySelectDetail(ListQrRepertorySelectDetailReq req) {
 
-        ListQrRepertorySelectDetailRes res = new ListQrRepertorySelectDetailRes();
-
+        //查询
         List<QrRepertorySelectDetailVO> voList = qrRepertoryMapper.listQrRepertorySelectDetail(req.getId());
+
+        //构造出参
+        ListQrRepertorySelectDetailRes res = new ListQrRepertorySelectDetailRes();
         List<ListQrRepertorySelectDetailRes.QrRepertorySelectDetailBean> beanList = PojoConverterUtils.copyList(voList, ListQrRepertorySelectDetailRes.QrRepertorySelectDetailBean.class);
         res.setQrRepertorySelectDetailBeanList(beanList);
+
         return res;
     }
 }

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrBoxCodeFormatSplitMapper.xml

@@ -42,14 +42,14 @@
 
     <select id="listSplitDetail" resultType="com.abi.qms.platform.dao.vo.result.QrRepertorySelectDetailVO">
         select qr.id as repertoryId,
-        qrc.id as repertoryColumnId,
-        qrc.sort_number,
-        qrc.alias,
-        qbs.split_num,
-        qbs.id as splitId
+            qrc.id as qr_repertory_column_id,
+            qrc.sort_number,
+            qrc.alias,
+            qbs.split_num,
+            qbs.id as splitId
         from qr_box_code_format_split qbs
-        inner join qr_repertory qr on qr.id=qbs.qr_repertory_id
-        inner join qr_repertory_column qrc on qr.id=qrc.qr_repertory_id
+            inner join qr_repertory qr on qr.id=qbs.qr_repertory_id
+            inner join qr_repertory_column qrc on qrc.id=qbs.qr_repertory_column_id
         <where>
             <if test="boxCodeFormatId != null and boxCodeFormatId != ''">
                 qbs.box_code_format_id = #{boxCodeFormatId}

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrRepertoryMapper.xml

@@ -153,21 +153,19 @@
     <select id="listQrRepertorySelectDetail"
             resultType="com.abi.qms.platform.dao.vo.result.QrRepertorySelectDetailVO">
         select
-        qr.id as repertoryId,
-        qrc.id as repertoryColumnId,
-        qrc.sort_number,
-        qrc.alias,
-        qbs.split_num,
-        qbs.id as splitId
+            qr.id as repertoryId,
+            qrc.id as qr_repertory_column_id,
+            qrc.sort_number,
+            qrc.alias
         from qr_repertory qr
-        inner join qr_repertory_column qrc on qr.id=qrc.qr_repertory_id
-        inner join qr_box_code_format_split qbs on qrc.id = qbs.qr_repertory_column_id
+            inner join qr_repertory_column qrc on qr.id=qrc.qr_repertory_id
+
         <where>
-            qr.is_delete = 0
-            AND qr.is_sys = 0
             <if test="id != null and id != ''">
-                qr.id = #{id}
+                and qr.id = #{id}
             </if>
+            and qr.is_delete = 0
+            and qr.is_sys = 0
         </where>
     </select>