From 02bc3bfe47e3d5311a0bb041c94e70a34b1ca73c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 09 四月 2024 09:03:01 +0800
Subject: [PATCH] git ch

---
 server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java |   27 +++++++++++++++++++++++----
 1 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
index dea6695..99e04df 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
@@ -1,5 +1,6 @@
 package com.doumee.service.business.impl;
 
+import com.doumee.biz.system.SystemDictDataBiz;
 import com.doumee.core.constants.ResponseStatus;
 import com.doumee.core.exception.BusinessException;
 import com.doumee.core.model.LoginUserInfo;
@@ -37,6 +38,8 @@
 @Service
 public class SolutionsServiceImpl implements SolutionsService {
 
+    @Autowired
+    private SystemDictDataBiz systemDictDataBiz;
     @Autowired
     private MultifileMapper multifileMapper;
     @Autowired
@@ -99,6 +102,8 @@
             file.setObjType(Constants.MultiFile.SOLUTIONS_CONFIRMATION_LATTER.getKey());
             file.setType(Constants.formatIntegerNum(file.getType()));
             multifileMapper.insert(file);
+           file.setObjId(newModel.getId());
+            multifileMapper.insert(file);
         }
         return solutions.getId();
     }
@@ -151,7 +156,7 @@
 //                ||Constants.formatIntegerNum(solutions.getPriceCycleUnit()) < 0
                 ||Constants.formatIntegerNum(solutions.getInsureCycle()) < 0
                 ||Constants.formatIntegerNum(solutions.getInsureCycleUnit()) < 0
-                || solutions.getMinAge() >solutions.getMaxAge()
+                ||Constants.formatIntegerNum( solutions.getMinAge()) >Constants.formatIntegerNum(solutions.getMaxAge())
                 || Constants.formatBigdecimal(solutions.getPrice()).compareTo(new BigDecimal(0)) !=1
         ){
             throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -189,6 +194,7 @@
         }
         //鏁版嵁鏈夋晥鎬ф牎楠�
         initCreateParam(solutions);
+        solutions.setType(null);//涓嶆敮鎸佷慨鏀规姇淇濇柟妗�
         if(solutionsMapper.selectCount(new QueryWrapper<Solutions>().lambda()
                 .eq(Solutions::getName,solutions.getName())
                 .eq(Solutions::getIsdeleted,Constants.ZERO)
@@ -209,7 +215,6 @@
                 .last("limit 1")
         );
 
-
         if(Objects.isNull(oldVersion)){
             throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鍘嗗彶鐗堟湰鏁版嵁");
         }
@@ -229,8 +234,9 @@
                 .lambda()
                 .eq(SolutionWorktype::getSolutionId,solutions.getId())
         );
-        if(Constants.equalsObject(solutions.getType(),Constants.ONE) ){
+        if(Constants.equalsObject(model.getType(),Constants.ONE) ){
             if  (solutions.getFanganFile()!=null && StringUtils.isNotBlank(solutions.getFanganFile().getFileurl())){
+
                 multifileMapper.update(null,new UpdateWrapper<Multifile>().lambda()
                                 .set(Multifile::getIsdeleted,Constants.ONE)
                                 .set(Multifile::getEditDate,solutions.getEditDate())
@@ -238,6 +244,7 @@
                                 .eq(Multifile::getObjId,solutions.getId())
                                 .eq(Multifile::getIsdeleted,Constants.ZERO)
                                 .eq(Multifile::getObjType,Constants.MultiFile.SOLUTIONS_CONFIRMATION_LATTER.getKey()));
+
                 Multifile file = solutions.getFanganFile();
                 file.setIsdeleted(Constants.ZERO);
                 file.setCreateDate(solutions.getEditDate());
@@ -245,6 +252,8 @@
                 file.setObjId(solutions.getId());
                 file.setObjType(Constants.MultiFile.SOLUTIONS_CONFIRMATION_LATTER.getKey());
                 file.setType(Constants.formatIntegerNum(file.getType()));
+                multifileMapper.insert(file);
+                file.setObjId(newModel.getId());
                 multifileMapper.insert(file);
             }
         }
@@ -339,7 +348,11 @@
                 .eq(Multifile::getObjType,Constants.MultiFile.SOLUTIONS_CONFIRMATION_LATTER.getKey())
                 .eq(Multifile::getIsdeleted,Constants.ZERO)
                 .last("limit 1"));
-        model.setFanganFile(f);//鏂规纭涔�
+        if(f!=null && StringUtils.isNotBlank(f.getFileurl())){
+            String url = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode()+f.getFileurl();
+            f.setFileurlFull(url);
+            model.setFanganFile(f);//鏂规纭涔�
+        }
         return model;
     }
 
@@ -351,12 +364,18 @@
 
     @Override
     public List<Solutions> findList(Solutions solutions) {
+        LoginUserInfo user = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
         solutions.setIsdeleted(Constants.ZERO);
         solutions.setStatus(Constants.ZERO);
         if(solutions.getDataType() == null){
             solutions.setDataType(Constants.TWO);
         }
+        if(Constants.equalsObject(user.getType(),Constants.TWO)){
+            //濡傛灉鏄垹闄�
+            solutions.setShopId(user.getCompanyId());
+        }
         QueryWrapper<Solutions> wrapper = new QueryWrapper<>(solutions);
+
         return solutionsMapper.selectList(wrapper);
     }
   

--
Gitblit v1.9.3