增加购砂单位删除校验接口

backend/inz.basis/src/main/java/com/beecode/inz/basis/internal/dao/SandUserDaoImpl.java

@@ -99,4 +99,16 @@ public class SandUserDaoImpl extends AbstractBaseDao {
 			return query.getResultList();
 		});
 	}
+
+	public List<KObject> querySandUserById(String purchaseSandCompanyId) {
+		UUID id = UUID.fromString(purchaseSandCompanyId);
+		return getHibernateTemplate().execute(session -> {
+			StringBuffer sql = new StringBuffer(
+					"FROM " + getModelName() + " WHERE sand_id =:id  AND enabled = 1 AND discard = 0 ");
+			// 创建查询
+			Query<KObject> query = session.createQuery(sql.toString(), KObject.class);
+			query.setParameter("id", id);
+			return query.getResultList();
+		});		
+	}
 }

backend/inz.basis/src/main/java/com/beecode/inz/basis/internal/service/SandUserServiceImpl.java

@@ -225,6 +225,12 @@ public class SandUserServiceImpl implements SandUserService {
 		return dao.getAllByUserListId(userListId);
 	}
 
+	@Override
+	public List<KObject> querySandUserById(String purchaseSandCompanyId) {
+		List<KObject> list = dao.querySandUserById(purchaseSandCompanyId);
+		return list;
+	}
+
 
 
 

backend/inz.basis/src/main/java/com/beecode/inz/basis/service/SandUserService.java

@@ -64,4 +64,6 @@ public interface SandUserService {
 
 	void resetPassword(String username, String password);
 
+	List<KObject> querySandUserById(String purchaseSandCompanyId);
+
 }

backend/inz.basis/src/main/java/com/beecode/inz/basis/web/SandUserController.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -243,4 +244,18 @@ public class SandUserController {
 			return ResponseObj.error("操作失败");
 		}
 	}
+	
+	/**
+	 * 根据购砂单位id查询购砂用户
+	 * @param purchaseSandCompanyId
+	 * @return
+	 */
+	@RequestMapping(value ="/sandUser/purchaseSandCompany/querySandUserById", method = RequestMethod.GET)
+	public Object querySandUserById(@RequestParam("purchaseSandCompanyId") String purchaseSandCompanyId) {
+		List<KObject> list = sandUserService.querySandUserById(purchaseSandCompanyId);
+		if (list.size() > 0) {
+			return ResponseObj.success("success", "该购砂单位下含有人员账号信息，不支持删除！");
+		}
+        return ResponseObj.success("success", null);
+	}
 }

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/internal/dao/ContractDao.java

@@ -332,4 +332,20 @@ public class ContractDao {
 		});
 	}
 
+	public KObject queryContractByPurchaseSandCompanyId(UUID purchaseSandCompanyId) {
+		return (KObject)template.execute(new HibernateCallback<KObject>() {
+			@Override
+			public KObject doInHibernate(Session session) throws HibernateException {
+				Query<KObject> query = session.createQuery("from " + ContractConstant.ENTITY_CONTRACT_INFO + " where (discard is null or discard = 0) and purchaseSandUnit.id =:purchaseSandCompanyId ", KObject.class);
+				query.setParameter("purchaseSandCompanyId", purchaseSandCompanyId);
+				//query.setParameter("contractState", ContractStateEnum.EXECUTING.name());
+				List<KObject> resultList = query.getResultList();
+				if (resultList.size() > 0) {
+					return resultList.get(0);
+				}
+				return null;
+			}
+		});
+	}
+
 }

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/internal/service/ContractServiceImpl.java

@@ -558,4 +558,10 @@ public class ContractServiceImpl implements ContractService {
 		KObject obj = contractDao.queryContractByProjectId(projectId);
 		return obj;
 	}
+
+	@Override
+	public KObject queryContractByPurchaseSandCompanyId(UUID purchaseSandCompanyId) {
+		KObject obj = contractDao.queryContractByPurchaseSandCompanyId(purchaseSandCompanyId);
+		return obj;
+	}
 }

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/service/ContractService.java

@@ -124,4 +124,6 @@ public interface ContractService {
 	void remindToCreatorApproved(String result,KObject contract);
 
 	KObject queryContractByProjectId(UUID fromString);
+
+	KObject queryContractByPurchaseSandCompanyId(UUID purchaseSandCompanyId);
 }

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/web/ContractController.java

@@ -245,4 +245,20 @@ public class ContractController {
 		return ResponseObj.success("success", null);
     }
 	
+	/**
+     * 根据购砂单位id查询合同
+     * @param projectId 
+     * @param contract
+     * @return
+     */
+	@ResponseBody
+    @RequestMapping(value = "/contract/queryContractByPurchaseSandCompanyId", method = RequestMethod.GET)
+    public Object queryContractByPurchaseSandCompanyId(@RequestParam("purchaseSandCompanyId") String purchaseSandCompanyId) {
+		KObject kObject = contractService.queryContractByPurchaseSandCompanyId(UUID.fromString(purchaseSandCompanyId));
+		if (kObject != null) {
+			return ResponseObj.success("success", kObject.getUuid("id"));
+		}
+		return ResponseObj.success("success", null);
+    }
+	
 }
\ No newline at end of file

backend/xyst.dinas.project/src/main/java/com/xyst/dinas/project/web/PurchaseSandCompanyController.java

@@ -73,4 +73,5 @@ public class PurchaseSandCompanyController {
 		purchaseSandCompanyService.updateEnableStatus(modelPath, enable, UUID.fromString(id));
         return ResponseObj.success();
 	}
+	
 }