anderx лет назад: 3
Родитель
Сommit
4a1513790f

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

@@ -484,6 +484,9 @@
   </if>
       where 1=1
     <if test="type==0">
+      <if test="assist ==0">
+        and a.assist in(0,1)
+      </if>
       <if test="assist == 2">
         and a.assist    =2
       </if>
@@ -493,9 +496,6 @@
       <if test="assist ==4">
         and a.assist in (2,3)
       </if>
-        <if test="assist !=2 and assist !=3 and assist !=4 and assistType !=1">
-          and a.assist in(0,1)
-        </if>
         <if test="aid !=null">
         and a.aid= #{aid}
         </if>
@@ -547,6 +547,9 @@
     </if>
     where 1=1
     <if test="type==0">
+      <if test="assist ==0">
+        and a.assist in(0,1)
+      </if>
       <if test="assist == 2">
         and a.assist    =2
       </if>
@@ -556,9 +559,6 @@
       <if test="assist ==4">
         and a.assist in (2,3)
       </if>
-      <if test="assist !=2 and assist !=3 and assist !=4 and assistType !=1">
-        and a.assist in(0,1)
-      </if>
       <if test="assistType ==1">
         and a.assist in(0,1,2)
       </if>

+ 4 - 0
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -565,6 +565,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				OutPublicReleaseDetails prd=new OutPublicReleaseDetails();
 				BeanUtils.copyProperties(out,prd);
 				prd.setPrid(id);
+				prd.setClockIn(0);
+				prd.setClockInTime(null);
+				prd.setClockInRemarks(null);
+				prd.setUfid(null);
 				publicReleaseDetailsMapper.insertSelective(prd);
 			}
 		}