Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectmaterialstorage/service/ProjectMaterialStorageService.java

@@ -5,12 +5,16 @@ import com.google.common.collect.Lists;
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.service.CrudService;
 import com.jeeplus.common.utils.IdGen;
+import com.jeeplus.common.utils.MenuStatusEnum;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatch;
 import com.jeeplus.modules.projectmaterialstorage.dao.ProjectMaterialStorageDao;
 import com.jeeplus.modules.projectmaterialstorage.entity.ProjectMaterialStorage;
 import com.jeeplus.modules.projectmaterialstorage.entity.ProjectMaterialStorageImport;
 import com.jeeplus.modules.ruralprojectrecords.dao.RuralProjectRecordsDao;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
+import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.utils.UserUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -35,10 +39,7 @@ public class ProjectMaterialStorageService extends CrudService<ProjectMaterialSt
         return super.get(id);
     }
 
-    public Page<ProjectMaterialStorage> findPage(Page<ProjectMaterialStorage> page,ProjectMaterialStorage projectMaterialStorage){
-//       调用方法
-        return super.findPage(page,projectMaterialStorage);
-    }
+
 
 //    /**
 //     * 查询分页导出用
@@ -172,4 +173,35 @@ public class ProjectMaterialStorageService extends CrudService<ProjectMaterialSt
         }
        projectMaterialStorageDao.batchInsert(projectMaterialStorageImports);
     }
+
+    /**
+     *分页方法
+     * @param page
+     * @param
+     * @return
+     */
+    @Override
+    public Page<ProjectMaterialStorage> findPage(Page<ProjectMaterialStorage> page, ProjectMaterialStorage projectMaterialStorage) {
+        boolean a = UserUtils.getUser().isAdmin();
+        //设置数据权限
+        if(!UserUtils.getUser().isAdmin()) {
+            String dataScopeSql = dataScopeFilter(projectMaterialStorage.getCurrentUser(), "o", "u", "s", MenuStatusEnum.WORK_RECORDS.getValue());
+            if(org.apache.commons.lang3.StringUtils.isBlank(dataScopeSql)){
+                dataScopeSql = dataScopeFilter(projectMaterialStorage.getCurrentUser(), "o", "u", "s", MenuStatusEnum.OVERALL_WORK_RECORDS.getValue());
+            }
+            projectMaterialStorage.getSqlMap().put("dsf", dataScopeSql);
+        }
+        int count = dao.queryCount(projectMaterialStorage);
+        page.setCount(count);
+        page.setCountFlag(false);
+        projectMaterialStorage.setPage(page);
+        List<ProjectMaterialStorage> projectMaterialStorageList = dao.findList(projectMaterialStorage);
+        for (ProjectMaterialStorage projectMaterialStorage1:projectMaterialStorageList){
+            User user=UserUtils.get(projectMaterialStorage1.getCreateBy().getId());
+            projectMaterialStorage1.setCreateBy(user);
+        }
+        page.setList(projectMaterialStorageList);
+        return page;
+    }
+
 }

src/main/java/com/jeeplus/modules/projectmaterialstorage/web/ProjectMaterialStorageController.java

@@ -165,8 +165,7 @@ public class ProjectMaterialStorageController extends BaseController {
            if(projectMaterialStorageService.delectBylogic(projectMaterialStorage) != 1){
                addMessage(redirectAttributes, "删除失败，请重试");
            }
-            return "redirect:"+Global.getAdminPath()+"/project/" +
-                    "/?repage";
+        return "redirect:"+Global.getAdminPath()+"/project/projectMaterialStorage/?repage";
         }
 
 
@@ -370,12 +369,12 @@ public class ProjectMaterialStorageController extends BaseController {
             if("1".equals(pageId)){
                 return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessageAll/?repage";
             }
-            return "redirect:"+Global.getAdminPath()+"/project/projectMaterialStorage/?repage";
+            return "redirect:"+Global.getAdminPath()+"/project/projectMaterialStorage";
         }
 //        进行项目名称、材料名称、价格重复的判断
         if(projectMaterialStorage.getProjectNumber()==null && projectMaterialStorage.getMaterialName() ==null && projectMaterialStorage.getPrice() == null ){
             addMessage(redirectAttributes, "项目名称、材料名称、价格等获取失败，请重试");
-            return "redirect:"+Global.getAdminPath()+"/project/projectMaterialStorage/?repage";
+            return "redirect:"+Global.getAdminPath()+"/project/projectMaterialStorage";
         }
 
 
@@ -390,7 +389,7 @@ public class ProjectMaterialStorageController extends BaseController {
         ruralProjectRecords.setprojectMaterialStorageStatus("2");
 
         projectMaterialStorageService.modifyProjectMaterialStorageStatus(ruralProjectRecords);
-        return "redirect:"+Global.getAdminPath()+"/project/projectMaterialStorage/?repage";
+        return "redirect:"+Global.getAdminPath()+"/project/projectMaterialStorage";
     }
 
 

src/main/resources/mappings/modules/projectMaterialStorage/ProjectMaterialStorageDao.xml

@@ -41,7 +41,7 @@
 
 	<select id="findList" resultType="com.jeeplus.modules.projectmaterialstorage.entity.ProjectMaterialStorage" >
 		SELECT
-		a.id,a.material_name,a.price,a.create_date as createDate,r.project_name,sys_area.name as 'areaName',a.project_number as 'projectNumber',a.unit as 'unit',r.project_id as 'projectId'
+		a.id,a.material_name,a.price,a.create_date as createDate,r.project_name,sys_area.name as 'areaName',a.project_number as 'projectNumber',a.unit as 'unit',r.project_id as 'projectId',a.create_by as 'createBy.id'
 		FROM project_material_storage a
 		left join rural_project_records as r
 		on a.project_number = r.id
@@ -70,9 +70,7 @@
 			<if test="endDate !=null">
 				AND a.create_date &lt; #{endDate}
 			</if>
-			<if test="projectId !=null">
-				AND r.project_id like concat(concat('%',#{projectId}),'%')
-			</if>
+
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -200,4 +198,54 @@
 		(#{data.id},#{data.createDate},#{data.delFlag},#{data.materialName},#{data.price},' ',#{data.projectNumber},#{data.updateBy.id},#{data.updateDate},#{data.createBy.id},#{data.unit})
 		</foreach>
 	</insert>
+
+	<select id="queryCount" resultType="int">
+<!--		select count(1)-->
+<!--		from project_material_storage a-->
+<!--		<where>-->
+<!--			a.del_flag = 0-->
+<!--			AND a.del_flag = #{DEL_FLAG_NORMAL}-->
+<!--			<if test="projectId !=null">-->
+<!--				AND a.project_id like concat(concat('%',#{projectId}),'%')-->
+<!--			</if>-->
+<!--		</where>-->
+
+		SELECT
+				count(1)
+				FROM project_material_storage a
+		left join rural_project_records as r
+		on a.project_number = r.id
+		LEFT JOIN sys_area
+		on sys_area.id = r.area_id
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			<if test="projectNumber != null and projectNumber != ''">
+				AND a.project_number LIKE
+				<if test="dbName == 'oracle'">'%'||#{projectNumber}||'%'</if>
+				<if test="dbName == 'mssql'">'%'+#{projectNumber}+'%'</if>
+				<if test="dbName == 'mysql'">concat('%',#{projectNumber},'%')</if>
+			</if>
+			<if test="projectName != null and projectName != ''">
+				AND r.project_name like concat(concat('%',#{projectName}),'%')
+			</if>
+			<if test="materialName != null and materialName != ''">
+				AND a.material_name like concat(concat('%',#{materialName}),'%')
+			</if>
+			<if test="areaName != null and areaName != ''">
+				AND r.area_name like concat(concat('%',#{areaName}),'%')
+			</if>
+			<if test="beginDate !=null">
+				AND a.create_date >= #{beginDate}
+			</if>
+			<if test="endDate !=null">
+				AND a.create_date &lt; #{endDate}
+			</if>
+
+		</where>
+
+
+	</select>
+
+
+
 </mapper>