Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/common/persistence/CrudDao.java

@@ -21,17 +21,17 @@ public interface CrudDao<T> extends BaseDao {
 	 * @return
 	 */
 	public T get(String id);
-	
+
 	/**
 	 * 获取单条数据
 	 * @param entity
 	 * @return
 	 */
 	public T get(T entity);
-	
+
 	/**
 	 * 根据实体名称和字段名称和字段值获取唯一记录
-	 * 
+	 *
 	 * @param <T>
 	 * @param entityClass
 	 * @param propertyName
@@ -40,7 +40,7 @@ public interface CrudDao<T> extends BaseDao {
 	 */
 	public  T findUniqueByProperty(@Param(value="propertyName")String propertyName, @Param(value="value")Object value);
 
-	
+
 	/**
 	 * 查询数据列表，如果需要分页，请设置分页对象，如：entity.setPage(new Page<T>());
 	 * @param entity
@@ -60,7 +60,7 @@ public interface CrudDao<T> extends BaseDao {
 	 * @return
 	 */
 	public List<T> findAllList(T entity);
-	
+
 	/**
 	 * 查询所有数据列表
 	 * @see public List<T> findAllList(T entity)
@@ -68,21 +68,21 @@ public interface CrudDao<T> extends BaseDao {
 	 */
 	@Deprecated
 	public List<T> findAllList();
-	
+
 	/**
 	 * 插入数据
 	 * @param entity
 	 * @return
 	 */
 	public int insert(T entity);
-	
+
 	/**
 	 * 更新数据
 	 * @param entity
 	 * @return
 	 */
 	public int update(T entity);
-	
+
 	/**
 	 * 删除数据（物理删除，从数据库中彻底删除）
 	 * @param id
@@ -91,7 +91,7 @@ public interface CrudDao<T> extends BaseDao {
 	 */
 	@Deprecated
 	public int delete(String id);
-	
+
 	/**
 	 * 删除数据（逻辑删除，更新del_flag字段为1,在表包含字段del_flag时，可以调用此方法，将数据隐藏）
 	 * @param id
@@ -100,14 +100,14 @@ public interface CrudDao<T> extends BaseDao {
 	 */
 	@Deprecated
 	public int deleteByLogic(String id);
-	
+
 	/**
 	 * 删除数据（物理删除，从数据库中彻底删除）
 	 * @param entity
 	 * @return
 	 */
 	public int delete(T entity);
-	
+
 	/**
 	 * 删除数据（逻辑删除，更新del_flag字段为1,在表包含字段del_flag时，可以调用此方法，将数据隐藏）
 	 * @param entity
@@ -119,5 +119,5 @@ public interface CrudDao<T> extends BaseDao {
 	 * @param entity
 	 * @return
 	 */
-	public int queryCount(T entity);
-}
+	public Integer queryCount(T entity);
+}

src/main/java/com/jeeplus/modules/projectConstruction/dao/ContractDao.java

@@ -21,7 +21,7 @@ import java.util.Map;
 @MyBatisDao
 public interface ContractDao extends CrudDao<ConstructionContract> {
 
-    int queryCount(ConstructionContract constructionContract);
+    Integer queryCount(ConstructionContract constructionContract);
 
     /**
      * 根据项目id查询施工合同集合
@@ -43,4 +43,4 @@ public interface ContractDao extends CrudDao<ConstructionContract> {
      * @return
      */
     ProjectRecords getRecords(String projectId);
-}
+}

src/main/java/com/jeeplus/modules/projectrecord/dao/ProjectRecordsDao.java

@@ -41,7 +41,7 @@ public interface ProjectRecordsDao extends CrudDao<ProjectRecords> {
      * @return
      */
     List<ProjectRecords> ruralFindPageByReimbur(ProjectRecords records);
-    int queryCount(ProjectRecords records);
+    Integer queryCount(ProjectRecords records);
     int queryCountByStatus(ProjectRecords records);
 
     List<ProjectType> getProjectType(String projectTypeId);
@@ -83,4 +83,4 @@ public interface ProjectRecordsDao extends CrudDao<ProjectRecords> {
      */
     List<ProjectRecords> processProjectPlanList(ProjectRecords records);
 
-}
+}

src/main/java/com/jeeplus/modules/ruralprojectrecords/dao/RuralProjectMessageDao.java

@@ -38,7 +38,7 @@ public interface RuralProjectMessageDao extends CrudDao<RuralProjectRecords> {
 
     RuralProjectRecords findUseableByProjectId(String projectId);
     List<RuralProjectRecords> findPageByRe(RuralProjectRecords records);
-    int queryCount(RuralProjectRecords records);
+    Integer queryCount(RuralProjectRecords records);
     int queryCountByStatus(RuralProjectRecords records);
 
 

src/main/java/com/jeeplus/modules/ruralprojectrecords/dao/RuralProjectRecordsDao.java

@@ -31,7 +31,7 @@ public interface RuralProjectRecordsDao extends CrudDao<RuralProjectRecords> {
 
     RuralProjectRecords findUseableByProjectId(String projectId);
     List<RuralProjectRecords> findPageByRe(RuralProjectRecords records);
-    int queryCount(RuralProjectRecords records);
+    Integer queryCount(RuralProjectRecords records);
     int queryCountByStatus(RuralProjectRecords records);
 
     /**

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageNewService.java

@@ -2555,11 +2555,11 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
                             //正式接口
                             String url = "http://comp.jszj.com.cn:8031/api/addProject";
                             //发送请求
-                            /*String returnResult = HttpPostTool.doPost(url, encryptByAes);
+                            String returnResult = HttpPostTool.doPost(url, encryptByAes);
                             HashMap hashMap = JSON.parseObject(returnResult, HashMap.class);
                             if(!"1".equals(hashMap.get("code"))){
                                 return "上报失败：" + hashMap.get("msg").toString();
-                            }*/
+                            }
                         } else {
                             notifyRole = "调整上报信息";
                             workActivityProcess.setIsApproval("2");

src/main/java/com/jeeplus/modules/wexintheorder/dao/TheOrderInformationDao.java

@@ -6,6 +6,6 @@ import com.jeeplus.modules.wexintheorder.entity.TheOrderInformation;
 
 @MyBatisDao
 public interface TheOrderInformationDao extends CrudDao<TheOrderInformation> {
-    int queryCount(TheOrderInformation theOrderInformation);
+    Integer queryCount(TheOrderInformation theOrderInformation);
 
 }

src/main/java/com/jeeplus/modules/wexintheorder/dao/TheOrderWebDao.java

@@ -8,7 +8,7 @@ import java.util.List;
 
 @MyBatisDao
 public interface TheOrderWebDao extends CrudDao<TheOrder> {
-    int queryCount(TheOrder theOrder);
+    Integer queryCount(TheOrder theOrder);
 
     /*查询分管领导名称*/
     List<TheOrder> getLeadershipList(TheOrder theOrder);

src/main/java/com/jeeplus/modules/workadministrativeatamp/dao/WorkAdministrativeAtampDao.java

@@ -18,5 +18,5 @@ public interface WorkAdministrativeAtampDao extends CrudDao<WorkAdministrativeAt
 
     void updateProcessIdAndStatus(WorkAdministrativeAtamp workAdministrativeAtamp);
 
-    int queryCount(WorkAdministrativeAtamp workAdministrativeAtamp);
-}
+    Integer queryCount(WorkAdministrativeAtamp workAdministrativeAtamp);
+}

src/main/java/com/jeeplus/modules/workbidproject/dao/WorkBidProjectDao.java

@@ -32,31 +32,31 @@ public interface WorkBidProjectDao extends CrudDao<WorkBidProject> {
 	 * @return
 	 */
 	public List<String> getProjectMember(WorkBidProject workBidProject);
-	
-	
-	
+
+
+
 	/**
 	 * 取得工程成员用户数据
 	 * @param workBidProject
 	 * @return
 	 */
 	public List<String> getProjectMaster(WorkBidProject workBidProject);
-	
-	
+
+
 	/**
 	 * 插入工程成员用户数据
 	 * @param workBidProject
 	 * @return
 	 */
 	public int insertProjectMember(WorkBidProject workBidProject);
-	
+
 	/**
 	 * 插入工程负责人用户数据
 	 * @param workBidProject
 	 * @return
 	 */
 	public int insertProjectMaster(WorkBidProject workBidProject);
-	
+
 	/**
 	 * 删除工程用户关联数据
 	 * @param workBidProject
@@ -73,31 +73,31 @@ public interface WorkBidProjectDao extends CrudDao<WorkBidProject> {
 
 
 	/**
-	 * 删除负责人用户和资格预审工程关联表数据 
+	 * 删除负责人用户和资格预审工程关联表数据
 	 * @param workBidProject
 	 * @return
 	 */
 	public int deleteProjectMaster(WorkBidProject workBidProject);
-	
-	
-	
-	
+
+
+
+
 	/**
 	 * 取得工程实施部门数据
 	 * @param workBidProject
 	 * @return
 	 */
 	public List<String> getImplementingDept(WorkBidProject workBidProject);
-	
-	
-	
+
+
+
 	/**
 	 * 插入工程实施部门数据
 	 * @param workBidProject
 	 * @return
 	 */
 	public int insertImplementingDept(WorkBidProject workBidProject);
-	
+
 	/**
 	 * 删除工程实施部门数据
 	 * @param workBidProject
@@ -139,5 +139,5 @@ public interface WorkBidProjectDao extends CrudDao<WorkBidProject> {
 
 	public List<WorkBidProject> findListByBidDate(WorkBidProject workBidProject);
 	//单独查总数
-	int queryCount(WorkBidProject workBidProject);
-}
+	Integer queryCount(WorkBidProject workBidProject);
+}

src/main/java/com/jeeplus/modules/workclientinfo/dao/WorkClientInfoDao.java

@@ -28,7 +28,7 @@ public interface WorkClientInfoDao extends CrudDao<WorkClientInfo> {
     int getBeUsedCount5(String clientId);
 
     int countByUscCode(String uscCode);
-    int queryCount(WorkClientInfo workClientInfo);
+    Integer queryCount(WorkClientInfo workClientInfo);
 
     List<WorkClientInfo> findAll(WorkClientInfo workClientInfo);
     int queryAllCount(WorkClientInfo workClientInfo);
@@ -53,4 +53,4 @@ public interface WorkClientInfoDao extends CrudDao<WorkClientInfo> {
      * @return
      */
     String getJobTypeStr(String clientId);
-}
+}

src/main/java/com/jeeplus/modules/workfullmanage/dao/WorkFullPayDao.java

@@ -19,7 +19,7 @@ public interface WorkFullPayDao extends CrudDao<WorkFullPay> {
      * 查询记录数
      * @return
      */
-	public int queryCount(WorkFullPay workFullPay);
+	public Integer queryCount(WorkFullPay workFullPay);
 
     /**
      * 查询累计支付金额
@@ -53,4 +53,4 @@ public interface WorkFullPayDao extends CrudDao<WorkFullPay> {
      * @return
      */
     public int getStatusNotFour(WorkFullPay workFullPay);
-}
+}

src/main/java/com/jeeplus/modules/workreimbursement/dao/WorkReimbursementDao.java

@@ -24,7 +24,7 @@ import java.util.Map;
 public interface WorkReimbursementDao extends CrudDao<WorkReimbursement> {
 
 	public List<WorkBidProject> findListByproject(WorkBidProject project);
-	public int queryCount(WorkReimbursement WorkReimbursement);
+	public Integer queryCount(WorkReimbursement WorkReimbursement);
 
 	public List<ProjectRecords> findListByprojectt(ProjectRecords project);
 	/**
@@ -40,4 +40,4 @@ public interface WorkReimbursementDao extends CrudDao<WorkReimbursement> {
      */
     public WorkReimbursement getByProcessInstanceId(String processInstanceId);
 
-}
+}