兼容邮储产品

eladmin-system/src/main/java/me/zhengjie/application/admin/service/impl/ModelNotarizationServiceImpl.java

@@ -19,7 +19,9 @@ import me.zhengjie.dao.mybatis.entity.NotaryOfficeEntity;
 import me.zhengjie.dao.mybatis.mapper.NotaryNoteMapper;
 import me.zhengjie.dao.mybatis.mapper.ModelMapper;
 import me.zhengjie.dao.mybatis.mapper.NotaryOfficeMapper;
+import me.zhengjie.domain.model.ModelConstant;
 import me.zhengjie.domain.user.UserDomain;
+import me.zhengjie.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -154,7 +156,7 @@ public class ModelNotarizationServiceImpl implements ModelNotarizationService {
         }
         modelMapper.insert(model);
         //
-        if ("6,7,8,9".indexOf(req.getCode()) > -1) {
+        if (ModelConstant.MODEL_TYPE_NOTE.equals(req.getCode())) {
             ModelEntity savedModel = getModel(req);
             List<NotaryNoteEntity> entityList = BeanCopyUtils.convertList2List(req.getNotaryNote(), NotaryNoteEntity.class);
             int i = 1;
@@ -186,20 +188,26 @@ public class ModelNotarizationServiceImpl implements ModelNotarizationService {
 
     /**
      * 排序值是否已经存在
+     *
      * @param req
      * @return
      */
-    private boolean isSortExist(ModelReq req){
+    private boolean isSortExist(ModelReq req) {
         QueryWrapper<ModelEntity> qw = new QueryWrapper<>();
         qw.ne("code", req.getCode());
         qw.eq("notary_office_id", req.getNotaryOfficeId());
         qw.eq("product_type", req.getProductType());
+        qw.eq("contract_type", req.getContractType());
         qw.eq("sort", req.getSort());
+        if (req.getId() != null && req.getId() != 0) {
+            qw.ne("id", req.getId());
+        }
         qw.in("status", 0, 1);
         List<ModelEntity> modelList = modelMapper.selectList(qw);
         return modelList != null && modelList.size() > 0;
     }
 
+
     /**
      * 修改公证文书模板
      *
@@ -219,7 +227,7 @@ public class ModelNotarizationServiceImpl implements ModelNotarizationService {
                 .content(req.getContent()).notaryOfficeId(req.getNotaryOfficeId()).status(req.getStatus()).contractType(req.getContractType())
                 .title(req.getTitle()).productType(req.getProductType()).build();
         modelMapper.updateById(model);
-        if ("6,7,8,9".indexOf(req.getCode()) > -1) {
+        if (ModelConstant.MODEL_TYPE_NOTE.equals(req.getCode())) {
             QueryWrapper<NotaryNoteEntity> qw = new QueryWrapper<>();
             qw.eq("model_id", req.getId());
             notaryNoteDao.delete(qw);

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/ModelRepository.java

@@ -8,6 +8,7 @@ import me.zhengjie.dao.mybatis.entity.NotaryNoteEntity;
 import me.zhengjie.dao.mybatis.mapper.ModelMapper;
 import me.zhengjie.dao.mybatis.mapper.NotarizationNoMapper;
 import me.zhengjie.dao.mybatis.mapper.NotaryNoteMapper;
+import me.zhengjie.domain.model.ModelConstant;
 import org.springframework.stereotype.Component;
 
 import java.text.SimpleDateFormat;
@@ -90,7 +91,7 @@ public class ModelRepository {
         model.eq("status", 1);
         model.eq("product_type", prodId);
         model.eq("contract_type", contractType);
-        model.in("code", "1,2,3,4,5".split(","));
+        model.in("code", ModelConstant.MODEL_TYPE_COMMON_LIST);
         return modelMapper.selectList(model);
     }
 

eladmin-system/src/main/java/me/zhengjie/domain/model/ModelConstant.java

@@ -7,11 +7,9 @@ public class ModelConstant {
     public static final String MODEL_TYPE_APPLY = "1";
     public static final String MODEL_TYPE_CONFIRMATION = "2";
     public static final String MODEL_TYPE_NOTICE = "3";
-    public static final String MODEL_TYPE_NOTIFICATION = "4";
-    public static final String MODEL_TYPE_PROMISE = "5";
-    public static final String MODEL_TYPE_NOTE = "6";
+    public static final String MODEL_TYPE_NOTE = "4";
     public static final String MODEL_TYPE_NOTARIZATION = "10";
-    public static final String[] MODEL_TYPE_COMMON_LIST = {MODEL_TYPE_APPLY, MODEL_TYPE_CONFIRMATION, MODEL_TYPE_NOTICE, MODEL_TYPE_NOTIFICATION, MODEL_TYPE_PROMISE};
+    public static final String[] MODEL_TYPE_COMMON_LIST = {MODEL_TYPE_APPLY, MODEL_TYPE_CONFIRMATION, MODEL_TYPE_NOTICE};
     /**
      * 模板状态
      */