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

合同管理--批量删除合同

Antiloveg лет назад: 8
Родитель
Сommit
b0cbdc746f

+ 15 - 0
src/main/java/com/goafanti/admin/controller/AdminContractApiController.java

@@ -1,5 +1,6 @@
 package com.goafanti.admin.controller;
 
+import java.util.Arrays;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -58,6 +59,20 @@ public class AdminContractApiController extends CertifyApiController {
 	private TechProjectService		techProjectService;
 	
 	/**
+	 * 批量删除合同
+	 */
+	@RequestMapping(value = "/delete", method = RequestMethod.POST)
+	public Result delete(@RequestParam(name = "ids[]", required = false) String[] ids){
+		Result res = new Result();
+		if (ids == null || ids.length < 1) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
+		} else {
+			res.setData(contractService.deleteByPrimaryKey(Arrays.asList(ids)));
+		}
+		return res;
+	}
+	
+	/**
 	 * 合同编号下拉
 	 */
 	@RequestMapping(value= "/serialNumber", method = RequestMethod.GET)

+ 0 - 3
src/main/java/com/goafanti/admin/controller/AdminTechProjectApiController.java

@@ -310,9 +310,6 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	@RequestMapping(value = "/deleteTechProject", method = RequestMethod.POST)
 	public Result deleteTechProject(@RequestParam(name = "ids[]", required = false) String[] ids) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (ids == null || ids.length < 1) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
 		} else {

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

@@ -22,4 +22,6 @@ public interface ContractMapper {
 	ContractDetail selectContractDetail(String id);
 
 	List<ContractSerialNumber> selectContractSerialNumber(String principal);
+
+	int batchDeleteByPrimaryKey(List<String> id);
 }

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

@@ -36,4 +36,6 @@ public interface CopyrightInfoMapper {
 	List<CopyrightContractListBo> listContractCopyrightByContractId(String contractId);
 
 	void batchInsert(List<CopyrightInfo> ci);
+
+	int batchDeleteByContractId(List<String> id);
 }

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

@@ -41,4 +41,6 @@ public interface OrgCognizanceMapper {
 
 	List<CognizanceContractBo> selectContractCognizanceByContractId(String contractId);
 
+	int batchDeleteByContractId(List<String> id);
+
 }

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

@@ -45,5 +45,7 @@ public interface PatentInfoMapper {
 	List<PatentContractListBo> listContractPatentByContractId(String contractId);
 
 	void batchInsert(List<PatentInfo> pi);
+
+	int batchDeleteByContractId(List<String> id);
 	
 }

+ 8 - 0
src/main/java/com/goafanti/common/mapper/ContractMapper.xml

@@ -423,4 +423,12 @@
   </if>
    order by c.serial_number desc
   </select>
+  
+  <update id="batchDeleteByPrimaryKey" parameterType="java.util.List">
+  	update contract set deleted_sign = 1
+  	where  id in 
+	<foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+		#{item}
+	</foreach>
+  </update>
 </mapper>

+ 8 - 0
src/main/java/com/goafanti/common/mapper/CopyrightInfoMapper.xml

@@ -480,4 +480,12 @@
     </foreach>
   </insert>
   
+   <update id="deleteByPrimaryKeys" parameterType="java.util.List">
+  	update copyright_info set delete_sign = 1
+  	where  contract_id in 
+	<foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+		#{item}
+	</foreach>
+  </update>
+  
 </mapper>

+ 8 - 0
src/main/java/com/goafanti/common/mapper/OrgCognizanceMapper.xml

@@ -533,4 +533,12 @@
   	left join admin a on a.id = oc.tech_principal 
   	where oc.contract_id = #{contractId,jdbcType=VARCHAR}
   </select>
+  
+  <update id="batchDeleteByContractId" parameterType="java.util.List">
+  	update org_cognizance set deleted_sign = 1
+  	where  contract_id in 
+	<foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+		#{item}
+	</foreach>
+  </update>
 </mapper>

+ 9 - 1
src/main/java/com/goafanti/common/mapper/PatentInfoMapper.xml

@@ -1064,5 +1064,13 @@
 	)
     </foreach>
   </insert>
-
+  
+  <update id="batchDeleteByContractId" parameterType="java.util.List">
+		update patent_info set deleted_sign = 1
+		where contract_id in
+		<foreach item="item" index="index" collection="list" open="("
+			separator="," close=")">
+			#{item}
+		</foreach>
+  </update>
 </mapper>

+ 3 - 0
src/main/java/com/goafanti/contract/service/ContractService.java

@@ -1,5 +1,6 @@
 package com.goafanti.contract.service;
 
+import java.util.List;
 import java.util.Map;
 
 import com.goafanti.common.model.Contract;
@@ -28,4 +29,6 @@ public interface ContractService {
 
 	Map<String, Integer> selectContractSerialNumber();
 
+	int deleteByPrimaryKey(List<String> asList);
+
 }

+ 34 - 18
src/main/java/com/goafanti/contract/service/impl/ContractServiceImpl.java

@@ -16,7 +16,10 @@ import org.springframework.stereotype.Service;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.ContractLogMapper;
 import com.goafanti.common.dao.ContractMapper;
+import com.goafanti.common.dao.CopyrightInfoMapper;
 import com.goafanti.common.dao.NoticeMapper;
+import com.goafanti.common.dao.OrgCognizanceMapper;
+import com.goafanti.common.dao.PatentInfoMapper;
 import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.enums.ContractBusinessStatus;
 import com.goafanti.common.enums.ContractStatus;
@@ -47,6 +50,12 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 	private UserMapper			userMapper;
 	@Autowired
 	private NoticeMapper		noticeMapper;
+	@Autowired
+	private PatentInfoMapper	patentInfoMapper;
+	@Autowired
+	private CopyrightInfoMapper copyrightInfoMapper;
+	@Autowired
+	private OrgCognizanceMapper orgCognizanceMapper;
 
 	@SuppressWarnings("unchecked")
 	@Override
@@ -77,7 +86,7 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 		if (!StringUtils.isBlank(uid)) {
 			params.put("uid", uid);
 		}
-		
+
 		if (!StringUtils.isBlank(id)) {
 			params.put("id", id);
 		}
@@ -226,7 +235,6 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 		c.setSignDate(signDate);
 		contractMapper.updateByPrimaryKeySelective(c);
 
-
 		List<ContractLog> logs = new ArrayList<>();
 		List<Notice> notice = new ArrayList<>();
 
@@ -241,6 +249,30 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 		noticeMapper.insertBatch(notice);
 	}
 
+	@Override
+	public Map<String, Integer> selectContractSerialNumber() {
+		String principal = null;
+		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
+			principal = TokenManager.getAdminId();
+		}
+		List<ContractSerialNumber> list = contractMapper.selectContractSerialNumber(principal);
+		Map<String, Integer> map = new TreeMap<>();
+		if (null != list && list.size() > 0) {
+			for (ContractSerialNumber c : list) {
+				map.put(c.getContractId(), c.getSerialNumber());
+			}
+		}
+		return map;
+	}
+
+	@Override
+	public int deleteByPrimaryKey(List<String> id) {
+		patentInfoMapper.batchDeleteByContractId(id);
+		copyrightInfoMapper.batchDeleteByContractId(id);
+		orgCognizanceMapper.batchDeleteByContractId(id);
+		return contractMapper.batchDeleteByPrimaryKey(id);
+	}
+
 	private Notice createNotice(Contract c, ContractLog l) {
 		Contract info = contractMapper.selectByPrimaryKey(c.getId());
 
@@ -265,20 +297,4 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 		n.setYear(info.getCognizanceYear());
 		return n;
 	}
-
-	@Override
-	public Map<String, Integer> selectContractSerialNumber() {
-		String principal = null;
-		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
-			principal = TokenManager.getAdminId();
-		}
-		List<ContractSerialNumber> list = contractMapper.selectContractSerialNumber(principal);
-		Map<String, Integer> map = new TreeMap<>();
-		if (null != list && list.size() > 0) {
-			for (ContractSerialNumber c : list) {
-				map.put(c.getContractId(), c.getSerialNumber());
-			}
-		}
-		return map;
-	}
 }