Просмотр исходного кода

部门修改,去掉技术总监和运营保障审核人修改

anderx 1 год назад
Родитель
Сommit
ce3619b0dd

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

@@ -5,6 +5,7 @@ import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.admin.bo.DepCountBo;
 import com.goafanti.admin.bo.DepCountBo;
 import com.goafanti.common.model.Department;
 import com.goafanti.common.model.Department;
 import com.goafanti.organization.bo.DepOut;
 import com.goafanti.organization.bo.DepOut;
+import com.goafanti.organization.bo.InputDep;
 import com.goafanti.organization.bo.OrganizationListOut;
 import com.goafanti.organization.bo.OrganizationListOut;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
@@ -128,4 +129,6 @@ public interface DepartmentMapper {
     void updateOrderDepFinanceNotExamine(@Param("newFinanceId") String newFinanceId, @Param("useFinanceId") String useFinanceId);
     void updateOrderDepFinanceNotExamine(@Param("newFinanceId") String newFinanceId, @Param("useFinanceId") String useFinanceId);
 
 
     void updateExpenseFinanceNotExamine(@Param("newFinanceId") String newFinanceId, @Param("useFinanceId") String useFinanceId);
     void updateExpenseFinanceNotExamine(@Param("newFinanceId") String newFinanceId, @Param("useFinanceId") String useFinanceId);
+
+    void updateNull(InputDep in);
 }
 }

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

@@ -621,4 +621,16 @@
         where a.process_status =3 and a.status =0 and a.auditor = #{useFinanceId}
         where a.process_status =3 and a.status =0 and a.auditor = #{useFinanceId}
           and b.id= #{newFinanceId}
           and b.id= #{newFinanceId}
     </update>
     </update>
+    <update id="updateNull">
+        update department
+        <set>
+            <if test="thAdminId ==null">
+                th_admin_id=null,
+            </if>
+            <if test="operationGuaranteeId ==null">
+                operation_guarantee_id=null,
+            </if>
+        </set>
+        where id=#{id}
+    </update>
 </mapper>
 </mapper>

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

@@ -58,6 +58,18 @@ public class InputDep {
      * 技术总监审核人
      * 技术总监审核人
      */
      */
     private String techAdminId;
     private String techAdminId;
+    /**
+     * 运营保障审核人
+     */
+    private String operationGuaranteeId;
+
+    public String getOperationGuaranteeId() {
+        return operationGuaranteeId;
+    }
+
+    public void setOperationGuaranteeId(String operationGuaranteeId) {
+        this.operationGuaranteeId = operationGuaranteeId;
+    }
 
 
     public String getTechAdminId() {
     public String getTechAdminId() {
         return techAdminId;
         return techAdminId;

+ 4 - 0
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

@@ -228,6 +228,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 		dep.setApproval(in.getApproval());
 		dep.setApproval(in.getApproval());
 		dep.setApprovalAid(in.getApprovalAid());
 		dep.setApprovalAid(in.getApprovalAid());
 		dep.setTechAdminId(in.getTechAdminId());
 		dep.setTechAdminId(in.getTechAdminId());
+		dep.setOperationGuaranteeId(in.getOperationGuaranteeId());
 		//财务与复审切换的时候要切换所有未审核的财务
 		//财务与复审切换的时候要切换所有未审核的财务
 		boolean updateFinance=false;
 		boolean updateFinance=false;
 		boolean updateRetrialFinance=false;
 		boolean updateRetrialFinance=false;
@@ -294,6 +295,9 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 		if (in.getCashierExamine()==1){
 		if (in.getCashierExamine()==1){
 			dep.setCashierExamine(in.getCashierExamine());
 			dep.setCashierExamine(in.getCashierExamine());
 		}
 		}
+		if (in.getTechAdminId()==null){
+			departmentMapper.updateNull(in);
+		}
         return departmentMapper.updateByPrimaryKeySelective(dep);
         return departmentMapper.updateByPrimaryKeySelective(dep);
 	}
 	}