Bladeren bron

Merge branch 'test' of jishutao/kede-server into prod

anderx 1 jaar geleden
bovenliggende
commit
53815bcbf1

+ 3 - 0
src/main/java/com/goafanti/common/dao/DepartmentMapper.java

@@ -117,4 +117,7 @@ public interface DepartmentMapper {
     Department selectByDepNo(String superId);
 
     void updateDepFinance(@Param("aid") String aid, @Param("transferId") String transferId);
+
+
+    void updateOrderDepFinanceNotExamine(@Param("newFinanceId") String newFinanceId, @Param("useFinanceId") String useFinanceId);
 }

+ 4 - 0
src/main/java/com/goafanti/common/dao/TOrderNewMapper.java

@@ -97,4 +97,8 @@ public interface TOrderNewMapper {
     OrganizationListOut selectOrderFinance(String orderNo);
 
     Department selectDepByOrderNo(String orderNo);
+
+    List<String> selectByFinanceNotExamine(String financeId);
+
+    void updateOrderDepFinanceExamineName(List<String> list);
 }

+ 7 - 0
src/main/java/com/goafanti/common/mapper/DepartmentMapper.xml

@@ -697,4 +697,11 @@
     where finance_id= #{aid}
   </update>
 
+  <update id="updateOrderDepFinanceNotExamine">
+    update t_order_examine a ,admin b
+    set a.aid=b.id , aname =b.name
+    where a.aid=#{useFinanceId} and a.status =0
+      and b.id= #{newFinanceId}
+  </update>
+
 </mapper>

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

@@ -2161,6 +2161,20 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
        #{e}
     </foreach>
   </update>
+  <update id="updateOrderDepFinanceExamineName">
+    update t_order_new x ,(select order_no ,group_concat(aname)name
+    from t_order_examine where order_no in
+    <foreach collection="list" item="e" close=")" open="(" separator=",">
+      #{e}
+    </foreach>
+    and status =0 group by order_no) y
+    set x.examine_name =y.name
+    where x.order_no in
+    <foreach collection="list" item="e" close=")" open="(" separator=",">
+      #{e}
+    </foreach>
+    and x.order_no =y.order_no
+  </update>
 
   <select id="selectAidAndDate" resultType="java.lang.Integer">
     select count(*)
@@ -2190,5 +2204,10 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
     from department a left join t_order_new b on a.id =b.order_dep
     where b.order_no= #{orderNo}
   </select>
+  <select id="selectByFinanceNotExamine" resultType="string">
+    select a.order_no orderNo,a.process_status processStatus
+    from t_order_new a left join t_order_examine b on a.order_no=b.order_no
+    where b.status=0 and b.aid = #{financeId} and a.process_status = 3
+  </select>
 
 </mapper>

+ 10 - 0
src/main/java/com/goafanti/organization/bo/InputDep.java

@@ -21,6 +21,7 @@ public class InputDep {
     private String id;
     private String abbreviation;
     private String financeId;
+    private String retrialFinanceId;
     private Integer workingHoursType;
     private Integer hideSign;
     @NotNull(message = "{"+ ErrorConstants.PARAM_EMPTY_ERROR+"}")
@@ -53,6 +54,15 @@ public class InputDep {
      */
     private Integer cashierExamine;
 
+
+    public String getRetrialFinanceId() {
+        return retrialFinanceId;
+    }
+
+    public void setRetrialFinanceId(String retrialFinanceId) {
+        this.retrialFinanceId = retrialFinanceId;
+    }
+
     public String getName() {
         return name;
     }

+ 21 - 1
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

@@ -3,6 +3,7 @@ package com.goafanti.organization.service.impl;
 import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.common.dao.DepartmentMapper;
 import com.goafanti.common.dao.ExpenseConfigDetailsMapper;
+import com.goafanti.common.dao.TOrderNewMapper;
 import com.goafanti.common.model.Department;
 import com.goafanti.common.model.ExpenseConfigDetails;
 import com.goafanti.common.utils.AsyncUtils;
@@ -29,6 +30,8 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 	private DepartmentMapper departmentMapper;
 	@Autowired
 	private ExpenseConfigDetailsMapper expenseConfigDetailsMapper;
+	@Autowired
+	private TOrderNewMapper torderNewMapper;
 
 	@Autowired
 	private AsyncUtils asyncUtils;
@@ -202,6 +205,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 	public int updateOrganization(InputDep in) {
 		//获取上级编号
 		Department superDep=departmentMapper.selectByPrimaryKey(in.getSuperId());
+		Department department = departmentMapper.selectByPrimaryKey(in.getId());
 		Date now=new Date();
 		Department dep=new Department();
 		dep.setLvl(superDep.getLvl()+1);
@@ -215,12 +219,28 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 		dep.setSuperId(in.getSuperId());
 		dep.setDepNo(in.getDepNo());
 		dep.setAbbreviation(in.getAbbreviation());
-		dep.setFinanceId(in.getFinanceId());
 		dep.setProvince(in.getProvince());
 		dep.setHideSign(in.getHideSign());
 		dep.setWorkingHoursType(in.getWorkingHoursType());
 		dep.setApproval(in.getApproval());
 		dep.setApprovalAid(in.getApprovalAid());
+		//财务与复审切换的时候要切换所有未审核的财务
+		if(StringUtils.isNotBlank(in.getFinanceId())&&!department.getFinanceId().equals(in.getFinanceId())){
+			dep.setFinanceId(in.getFinanceId());
+			//处理订单
+			departmentMapper.updateOrderDepFinanceNotExamine(in.getFinanceId(),department.getFinanceId());
+			List<String> list = torderNewMapper.selectByFinanceNotExamine(in.getFinanceId());
+			torderNewMapper.updateOrderDepFinanceExamineName(list);
+
+		}
+		if (StringUtils.isNotBlank(in.getRetrialFinanceId())&&
+				!department.getRetrialFinanceId().equals(in.getRetrialFinanceId())){
+			dep.setRetrialFinanceId(in.getRetrialFinanceId());
+			departmentMapper.updateOrderDepFinanceNotExamine(in.getRetrialFinanceId(),department.getRetrialFinanceId());
+			List<String> list = torderNewMapper.selectByFinanceNotExamine(in.getRetrialFinanceId());
+			torderNewMapper.updateOrderDepFinanceExamineName(list);
+		}
+
 		dep.setExpenseFinanceId(in.getExpenseFinanceId());
 		checkFinaceUpdate(in.getId(),in.getFinanceId());
 		if (in.getExpenseRetrialFinanceExamine()==1){

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -51,8 +51,8 @@ yxjl_max=100
 
 amb.maxLvl=6
 
-#static.host=//static.jishutao.com/1.3.09
-static.host=//172.16.1.187/1.3.09
+static.host=//static.jishutao.com/1.3.09
+#static.host=//172.16.1.187/1.3.09
 #avatar.host=//172.16.0.255:3000
 #static.host=//172.16.0.255:3000/1.2.62
 avatar.host=//static.jishutao.com