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

+ 7 - 2
src/main/java/com/goafanti/common/dao/TOrderApprovalMapper.java

@@ -2,6 +2,8 @@ package com.goafanti.common.dao;
 
 import com.goafanti.common.model.TOrderApproval;
 
+import java.util.List;
+
 /**
 * @author Administrator
 * @description 针对表【t_order_approval(订单特批分类表)】的数据库操作Mapper
@@ -10,16 +12,19 @@ import com.goafanti.common.model.TOrderApproval;
 */
 public interface TOrderApprovalMapper {
 
-    int deleteByPrimaryKey(Long id);
+    int deleteByPrimaryKey(Integer id);
 
     int insert(TOrderApproval record);
 
     int insertSelective(TOrderApproval record);
 
-    TOrderApproval selectByPrimaryKey(Long id);
+    TOrderApproval selectByPrimaryKey(Integer id);
 
     int updateByPrimaryKeySelective(TOrderApproval record);
 
     int updateByPrimaryKey(TOrderApproval record);
 
+    void deleteByOderNo(String orderNo);
+
+    List<TOrderApproval> selectByOrderNo(String orderNo);
 }

+ 17 - 2
src/main/java/com/goafanti/common/mapper/TOrderApprovalMapper.xml

@@ -16,17 +16,19 @@
         type_explain
     </sql>
 
-    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
         from t_order_approval
         where  id = #{id,jdbcType=INTEGER} 
     </select>
 
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
         delete from t_order_approval
         where  id = #{id,jdbcType=INTEGER} 
     </delete>
+
     <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderApproval" useGeneratedKeys="true">
         insert into t_order_approval
         ( id,order_no,type
@@ -72,4 +74,17 @@
             type_explain =  #{typeExplain,jdbcType=VARCHAR}
         where   id = #{id,jdbcType=INTEGER} 
     </update>
+
+
+    <delete id="deleteByOderNo">
+        delete from t_order_approval
+        where  order_no= #{orderNo}
+    </delete>
+
+    <select id="selectByOrderNo" parameterType="java.lang.Long" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from t_order_approval
+        where  order_no= #{orderNo}
+    </select>
 </mapper>

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

@@ -147,7 +147,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Autowired
 	private TOrderPublicReleaseCountMapper tOrderPublicReleaseCountMapper;
 	@Autowired
-	private RestrictProjectMapper restrictProjectMapper;
+	private TOrderApprovalMapper tOrderApprovalMapper;
 
 
 	@Value(value = "${upload.path}")
@@ -520,6 +520,25 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			t.setOrderDep(a.getDepartmentId());
 		}
 		if (t.getType() == null){
+			tOrderApprovalMapper.deleteByOderNo(t.getOrderNo());
+		}else {
+			String[] split = t.getType().split(",");
+			List<TOrderApproval> tOrderApprovals = tOrderApprovalMapper.selectByOrderNo(t.getOrderNo());
+			for (String s : split) {
+				//
+
+				Integer deleteId=null;
+				for (TOrderApproval e : tOrderApprovals) {
+					if (Integer.valueOf(s).equals(e.getType())){
+						deleteId=e.getId();
+						break;
+					}
+				}
+				if(deleteId!=null){
+					tOrderApprovalMapper.deleteByPrimaryKey(deleteId);
+				}
+			}
+
 		}
 		if (t.getKnowledgeServices()!=null||t.getAuditServices()!=null||t.getAddDeductionServices()!=null){
 			TOrderHighTech tighTech=new TOrderHighTech();