Browse Source

财税总监获取打卡数据BUG修复

anderx 3 years ago
parent
commit
202a4c9afe

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

@@ -1443,6 +1443,12 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
     <if test="o.orderNo != null and o.orderNo != &quot;&quot;">
       and o.order_no = #{o.orderNo,jdbcType=VARCHAR}
     </if>
+    <if test="o.projectType != null and o.projectType != &quot;&quot;">
+      and a.project_type = #{o.projectType}
+    </if>
+    <if test="o.approval != null and o.approval != &quot;&quot;">
+      and o.approval = #{o.approval}
+    </if>
     <if test="o.buyerName != null and o.buyerName != &quot;&quot;">
       <bind name="n" value="'%' + o.buyerName + '%'" />
       and u.nickname  like #{n,jdbcType=VARCHAR}

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

@@ -211,11 +211,11 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	public Pagination<OutPublicReleaseList> listPublicRelease(InputPublicReleaseList in) {
 		Map<String,Object> map =new HashMap<String, Object>();
 		map.put("type", in.getType()==null?0:in.getType());
-		if (in.getType()==0||in.getType()==1){
-			map.put("aid",TokenManager.getAdminId());
-		}else if (in.getType()==3) {
+		if (in.getType()==3) {
 			in.setAssist(2);
 			if (!TokenManager.hasRole(AFTConstants.TECH_FINANCE_DIRECTOR))map.put("aid",TokenManager.getAdminId());
+		}else{
+			map.put("aid",TokenManager.getAdminId());
 		}
 		if (StringUtils.isNotEmpty(in.getClockTime()))	map.put("clockTime", in.getClockTime());
 		if(StringUtils.isNotEmpty(in.getReleaseStarts()))	map.put("releaseStarts", in.getReleaseStarts());