Browse Source

咨询师管理员审核列表修改

anderx 2 years ago
parent
commit
2b86cee136

+ 3 - 1
src/main/java/com/goafanti/common/dao/TOrderExamineMapper.java

@@ -20,9 +20,11 @@ public interface TOrderExamineMapper {
 
     List<TOrderExamine> selectByOrderNo(String orderNo);
 
-    void updateStatusByOrderNo(@Param("orderNo") String orderNo,@Param("status") Integer status);
+    void updateStatusByOrderNo(@Param("orderNo")String orderNo,@Param("aid") String aid, @Param("status")Integer status);
 
     void insertBatch(@Param("list") List<TOrderExamine> list);
 
     int selectByOrderNoAndAid(@Param("orderNo")String orderNo,@Param("aid") String aid);
+
+
 }

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

@@ -111,7 +111,11 @@
     update t_order_examine
     set status= #{status}
     where order_no = #{orderNo,jdbcType=VARCHAR}
+    <if test="aid!=null">
+      and aid = #{aid}
+    </if>
   </update>
+
   <insert id="insertBatch">
     insert into t_order_examine (order_no, aid, `status`, aname)
     values
@@ -125,4 +129,6 @@
     from t_order_examine where status=0
     and order_no = #{orderNo} and aid= #{aid}
   </select>
+
+
 </mapper>

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

@@ -1047,6 +1047,9 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
         #{dep}
       </foreach>
     </if>
+    <if test="distribution == 4">
+      and a.process_status = 3
+    </if>
   	<if test="distribution == 0">
   	and a.process_status &lt; 6
   	</if>

+ 3 - 0
src/main/java/com/goafanti/order/bo/InputOrderNewListBo.java

@@ -10,6 +10,9 @@ public class InputOrderNewListBo {
     private String endTime;
     private Integer specially;
     private Integer approval;
+    /**
+     * 0=未审核,1=未分配,2=部分分配,3=全部分配
+     */
     private Integer distribution;
     private String deps;
     private String contractNo;

+ 5 - 4
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -517,7 +517,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			StringBuffer str=new StringBuffer();
 			for (TOrderExamine e : tOrderExamines) {
 				if (e.getStatus()==0){
-					str=str.append(e.getAname());
+					str=str.append(e.getAname()).append(",");
 				}
 			}
 			t.setExamineName(str.substring(0,str.length()-1));
@@ -539,7 +539,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			types.add(AFTConstants.CED_ASSISTANT);
 			for (Admin admin : adminMapper.getAdminRoleTypesList(types)) {
 				aids.add(admin.getId());
-				str=str.append(admin.getName());
+				str=str.append(admin.getName()).append(",");
 			}
 		}else if (new1.getApproval()==ApprovalNewState.DSZDSH.getCode()||
 				new1.getApproval()==ApprovalNewState.DSZBH.getCode()) {
@@ -550,7 +550,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			types.add(AFTConstants.APPROVAL_DECISION_ASSISTANT);
 			for (Admin admin : adminMapper.getAdminRoleTypesList(types)) {
 				aids.add(admin.getId());
-				str=str.append(admin.getName());
+				str=str.append(admin.getName()).append(",");
 			}
 		}else  {
 			t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
@@ -560,7 +560,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			t.setFinanceId(oo.getFinanceId());
 			for (Admin admin : adminMapper.getAdminRoleTypeList(AFTConstants.TECH_ADMIN)) {
 				aids.add(admin.getId());
-				str=str.append(admin.getName());
+				str=str.append(admin.getName()).append(",");
 			}
 		}
 		//用与外部修改名称
@@ -569,6 +569,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 	}
 
 	private boolean judgeOrderExamine(String orderNo) {
+		tOrderExamineMapper.updateStatusByOrderNo(orderNo,TokenManager.getAdminId(),1);
 		List<TOrderExamine> tOrderExamines = tOrderExamineMapper.selectByOrderNo(orderNo);
 		int max = tOrderExamines.size()+1;
 		int yes=0;

+ 10 - 1
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -801,6 +801,15 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		Pagination<TOrderNewBo> x = addParams(in, params);
 		if (x != null) return x;
 		Pagination<TOrderNewBo> p = (Pagination<TOrderNewBo>)findPage("selectOrderNewListByPage", "selectOrderNewListCount", params, in.getPageNo(), in.getPageSize());
+		if (TokenManager.hasRole(AFTConstants.FINANCE)){
+			List<TOrderNewBo> list = (List<TOrderNewBo>) p.getList();
+			for (TOrderNewBo o : list) {
+				int i = tOrderExamineMapper.selectByOrderNoAndAid(o.getOrderNo(), TokenManager.getAdminId());
+				if (i==0) o.setMyExamine(0);
+				else o.setMyExamine(1);
+			}
+		}
+
 		return p;
 	}
 
@@ -1011,7 +1020,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 					}
 					tOrderExamineMapper.insertBatch(list);
 				}else {
-					tOrderExamineMapper.updateStatusByOrderNo(orderNo,0);
+					tOrderExamineMapper.updateStatusByOrderNo(orderNo,null,0);
 					for (TOrderExamine e : tOrderExamines) {
 						aids.add(e.getAid());
 					}