生成项目编号

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidQuoteController.java

@@ -389,15 +389,19 @@ public class BidQuoteController extends BaseController
             if(item.getHid().equals(hid)){
                 if(current == 0){
                     item.setFirst(item.getFirst());
+                    item.setFirstTime(item.getFirstTime());
                 }
                 else if(current == 1){
                     item.setFirst(item.getFirst());
+                    item.setFirstTime(item.getFirstTime());
                 }
                 else if(current == 2){
                     item.setSecond(item.getSecond());
+                    item.setSecondTime(item.getSecondTime());
                 }
                 else if(current == 3){
                     item.setThird(item.getThird());
+                    item.setThirdTime(item.getThirdTime());
                 }
                 res.add(item);
             }else{
@@ -405,15 +409,21 @@ public class BidQuoteController extends BaseController
 
                 } else if(current == 1){
                     item.setFirst(item.getFirst());
+                    item.setFirstTime(item.getFirstTime());
                     item.setSecond(null);
+                    item.setSecondTime(null);
                     item.setThird(null);
+                    item.setThirdTime(null);
                     res.add(item);
                 } else if (current == 2) {
                     item.setSecond(item.getSecond());
+                    item.setSecondTime(item.getSecondTime());
                     item.setThird(null);
+                    item.setThirdTime(null);
                     res.add(item);
                 } else if (current == 3) {
                     item.setThird(item.getThird());
+                    item.setThirdTime(item.getThirdTime());
                     res.add(item);
                 }
             }

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/ExpertMarkController.java

@@ -309,9 +309,11 @@ public class ExpertMarkController extends BaseController{
         List<BidExpertRespond> respondDetails = bidExpertRespondService.selectBidExpertRespondList(bidExpertRespond);
         List<BidExpertTech> techDetails = bidExpertTechService.selectBidExpertTechList(bidExpertTech);
         mark.setSid(sid);
-        mark.setsName(info.getsName());
-        mark.setuKaiTime(info.getuKaiTime());
-        mark.setuKaiPosition(info.getuKaiPosition());
+        if(info != null){
+            mark.setsName(info.getsName());
+            mark.setuKaiTime(info.getuKaiTime());
+            mark.setuKaiPosition(info.getuKaiPosition());
+        }
         mark.setBidExpertExamines(examineDetails);
         mark.setBidExpertResponds(respondDetails);
         mark.setBidExpertTeches(techDetails);

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/project/controller/MastProjectController.java

@@ -112,7 +112,8 @@ public class MastProjectController extends BaseController {
         MastProject item = new MastProject();
         item.setProjCompanyname(mastProject.getProjCompanyname());
         item.setProjYear(mastProject.getProjYear());
-        List<MastProject> mastProjects = mastProjectService.selectMastProjectList(mastProject);
+        item.setOwnerDepts("("+l+")");
+        List<MastProject> mastProjects = mastProjectService.selectMastProjectList(item);
         Integer res = mastProjects.size()+1;
         String format = String.format("%04d",res);
         mastProject.setProjNo(format);