Explorar o código

修改合同变更列表

anderx hai 1 ano
pai
achega
14cb262213

+ 3 - 2
src/main/java/com/goafanti/business/service/impl/RestrictProjectServiceImpl.java

@@ -193,12 +193,13 @@ public class RestrictProjectServiceImpl extends BaseMybatisDao<RestrictProjectMa
 //                LocalDateTime endTime = lockTime.plusDays(30);
 //                long between = ChronoUnit.DAYS.between(now, endTime);
 //                e.setPrivateDays(between>0?(int)between:0);
-                e.setPrivateDays(e.getDays());
+                //保持与旧版开发29-0一致,所以减去一天
+                e.setPrivateDays(e.getDays()-1);
             }else if (e.getType()==2){
 //                LocalDateTime endTime = lockTime.plusDays(270);
 //                long between = ChronoUnit.DAYS.between(now, endTime);
 //                e.setSignDays(between>0?(int)between:0);
-                e.setSignDays(e.getDays());
+                e.setSignDays(e.getDays()-1);
             }
         }
     }

+ 6 - 0
src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml

@@ -688,6 +688,12 @@ from new_order_change a where 1 = 1 and status in (0,1,2,3)
     <if test="complete ==1 and processState > 6 and processState &lt; 8">
       and (a.process_state = #{processState}  and a.status =1)
     </if>
+    <if test="complete ==1 and processState > 6 and processState = 9">
+      and (a.process_state = #{processState}  and a.status =1)
+    </if>
+    <if test="complete ==1 and processState > 6 and processState = 10">
+      and (a.process_state = #{processState}  and a.status =1)
+    </if>
     <if test="complete ==2 and processState != 6 and processState != 8 and processState != 9 and processState !=3 and processState !=4">
       and a.process_state &gt; #{processState}
     </if>