Browse Source

财务审核修改

anderx 2 years ago
parent
commit
cf3dd305c9

+ 2 - 0
src/main/java/com/goafanti/common/dao/TOrderExamineMapper.java

@@ -29,4 +29,6 @@ public interface TOrderExamineMapper {
 
 
     void deleteByOrderNo(String orderNo);
+
+    List<TOrderExamine> selectExamineBytidAndAid(@Param("list")List<Integer> ids,@Param("aid") String aid);
 }

+ 12 - 1
src/main/java/com/goafanti/common/mapper/TOrderExamineMapper.xml

@@ -157,9 +157,20 @@
     from t_order_examine
     where tid = #{tid}
   </select>
-  <delete id="deleteByOrderNo">
+
+    <delete id="deleteByOrderNo">
     delete from t_order_examine
     where order_no = #{orderNo}
   </delete>
+  <select id="selectExamineBytidAndAid" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from t_order_examine a
+    where tid in
+    <foreach item="item" index="index" collection="list" separator="," open="(" close=")">
+    #{item}
+    </foreach>
+    and a.aid= #{aid}
+  </select>
 
 </mapper>

+ 10 - 0
src/main/java/com/goafanti/order/bo/OutMemberList.java

@@ -54,6 +54,16 @@ public class OutMemberList {
     private Integer yearSum;
     private String contractTerm;
 
+    private Integer myExamine;
+
+    public Integer getMyExamine() {
+        return myExamine;
+    }
+
+    public void setMyExamine(Integer myExamine) {
+        this.myExamine = myExamine;
+    }
+
     public String getContractTerm() {
         return contractTerm;
     }

+ 23 - 1
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -46,6 +46,7 @@ import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> implements OrderProjectService {
@@ -1221,7 +1222,28 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	public Pagination<OutMemberList> memberList(InputMemberList in) {
 		HashMap<String, Object> map = new HashMap<>();
 		addParam(in, map);
-		return (Pagination<OutMemberList>) findPage("findMemberList","findMemberCount",map,in.getPageNo(), in.getPageSize());
+		Pagination<OutMemberList> page = (Pagination<OutMemberList>) findPage("findMemberList", "findMemberCount", map, in.getPageNo(), in.getPageSize());
+		List<OutMemberList> list = (List<OutMemberList>) page.getList();
+		pushMyExamine(list);
+		return page;
+	}
+
+	private void pushMyExamine(List<OutMemberList> list) {
+		List<Integer> ids =list.stream().map(e -> e.getId()).collect(Collectors.toList());
+		List<TOrderExamine> examineList = tOrderExamineMapper.selectExamineBytidAndAid(ids, TokenManager.getAdminId());
+		list=list.stream().map(e -> {
+					examineList.forEach(ex -> {
+						if(e.getId().equals(ex.getTid())) {
+							if (ex.getStatus() == 1) {
+								e.setMyExamine(1);
+							}
+						}
+					});
+			if (e.getMyExamine()==null){
+				e.setMyExamine(0);
+			}
+			return e;
+		}).collect(Collectors.toList());
 	}
 
 	private void addParam(InputMemberList in, HashMap<String, Object> map) {