不同角色数据匹配标识

src/main/java/com/jeeplus/modules/sg/advence/activiti/service/AdvanceService.java

@@ -30,19 +30,23 @@ public class AdvanceService extends CrudService<AdvanceMapper, Advance> {
 		return advance;
 	}
 
+	@Override
 	public List<Advance> findList(Advance advance) {
 		return super.findList(advance);
 	}
 
+	@Override
 	public Page<Advance> findPage(Page<Advance> page, Advance advance) {
 		return super.findPage(page,advance);
 	}
 
+	@Override
 	@Transactional(readOnly = false)
 	public void save(Advance advance) {
 		super.save(advance);
 	}
 
+	@Override
 	@Transactional(readOnly = false)
 	public void delete(Advance advance) {
 		super.delete(advance);

src/main/java/com/jeeplus/modules/sg/materialmodule/activiti/mapper/xml/MaterialModuleMapper.xml

@@ -325,25 +325,28 @@
     </select>
     <select id="findListPage"
             resultType="com.jeeplus.modules.sg.materialmodule.activiti.entity.MaterialModule">
-        select id,
-        create_by,
-        create_date,
-        update_by,
-        update_date,
-        del_flag,
-        remarks,
-        proc_ins_id,
-        projectId,
-        plannedStart,
-        plannedEnd,
-        actualStart,
-        actualEnd,
-        projectManager,
-        personInCharge,
-        workPlace,
-        projectName,
-        reserveProjectName
-        from sg_construction_process
+        select
+        scp.id,
+        scp.create_by,
+        scp.create_date,
+        scp.update_by,
+        scp.update_date,
+        scp.del_flag,
+        scp.remarks,
+        scp.proc_ins_id,
+        scp.projectId,
+        scp.plannedStart,
+        scp.plannedEnd,
+        scp.actualStart,
+        scp.actualEnd,
+        scp.projectManager,
+        scp.personInCharge,
+        scp.workPlace,
+        scp.projectName,
+        scp.reserveProjectName
+        from sg_construction_process scp
+        left join xm_project_assignment xpa
+        on scp.reserveProjectName = xpa.reserveProjectName
         <where>
             1=1
             <if test="projectId!=null and projectId != ''">
@@ -355,6 +358,9 @@
             <if test="reserveProjectName!=null and reserveProjectName != ''">
                 and reserveProjectName = #{reserveProjectName}
             </if>
+            <if test="dataScope != null and dataScope != ''">
+                ${dataScope}
+            </if>
         </where>
     </select>
 </mapper>

src/main/java/com/jeeplus/modules/sg/materialmodule/activiti/mapper/xml/NonPowerMapper.xml

@@ -210,28 +210,31 @@
 		where a.id = #{id}
 	</select>
     <select id="findListPage" resultType="com.jeeplus.modules.sg.materialmodule.activiti.entity.NonPower">
-		select id,
-			   create_by,
-			   create_date,
-			   update_by,
-			   update_date,
-			   del_flag,
-			   remarks,
-			   proc_ins_id,
-			   projectId,
-			   plannedStart,
-			   plannedEnd,
-			   actualStart,
-			   actualEnd,
-			   projectManager,
-			   personInCharge,
-			   workPlace,
-			   constructionCivilWorks,
-			   civilStartReport,
-			   civilEndReport,
-			   projectName,
-			   reserveProjectName
-		from xm_nonpower_process
+		select
+		       xnp.id,
+			   xnp.create_by,
+			   xnp.create_date,
+			   xnp.update_by,
+			   xnp.update_date,
+			   xnp.del_flag,
+			   xnp.remarks,
+			   xnp.proc_ins_id,
+			   xnp.projectId,
+			   xnp.plannedStart,
+			   xnp.plannedEnd,
+			   xnp.actualStart,
+			   xnp.actualEnd,
+			   xnp.projectManager,
+			   xnp.personInCharge,
+			   xnp.workPlace,
+			   xnp.constructionCivilWorks,
+			   xnp.civilStartReport,
+			   xnp.civilEndReport,
+			   xnp.projectName,
+			   xnp.reserveProjectName
+		from xm_nonpower_process xnp
+		left join xm_project_assignment xpa
+		on xnp.reserveProjectName = xpa.reserveProjectName
 		<where>
 			1=1
 			<if test="projectId!=null and projectId != ''">
@@ -243,6 +246,9 @@
 			<if test="reserveProjectName!=null and reserveProjectName != ''">
 				and reserveProjectName = #{reserveProjectName}
 			</if>
+			<if test="dataScope != null and dataScope != ''">
+				${dataScope}
+			</if>
 		</where>
 	</select>
 </mapper>

src/main/java/com/jeeplus/modules/sg/scheduleView/mapper/xml/ScheduleViewMapper.xml

@@ -60,16 +60,19 @@
 
 
     <select id="scheduleProjectAll" resultType="com.jeeplus.modules.sg.scheduleView.entity.ScheduleView">
-        select reserveProjectName,
-               projectId,
-               projectName,
-               status,
-               acquisitionStatus,
-               advanceStatus,
-               constructionStatus,
-               whetherCloseStatus,
-               settStatus
-        from xm_material_project
+        select
+        xmp.reserveProjectName,
+        xmp.projectId,
+        xmp.projectName,
+        xmp.status,
+        xmp.acquisitionStatus,
+        xmp.advanceStatus,
+        xmp.constructionStatus,
+        xmp.whetherCloseStatus,
+        xmp.settStatus
+        from xm_material_project xmp
+        left join xm_project_assignment xpa
+        on xmp.reserveProjectName = xpa.reserveProjectName
         <where>
             1 = 1
             and
@@ -81,23 +84,28 @@
                 </foreach>
                 )
             </if>
+            <if test="dataScope != null and dataScope != ''">
+                ${dataScope}
+            </if>
         </where>
     </select>
 
     <select id="disAll" resultType="com.jeeplus.modules.sg.scheduleView.entity.ScheduleView">
         select a.projectName,
-            a.reserveProjectName,
-            a.projectId,
-            a.projectType,
-            a.status,
-            a.acquisitionStatus,
-            a.advanceStatus,
-            a.constructionStatus,
-            a.settStatus,
-            b.proc_ins_id
-            from xm_material_project a
-            LEFT JOIN xm_construction_clarificaiton b
-            on a.reserveProjectName = b.reserveProjectName
+        a.reserveProjectName,
+        a.projectId,
+        a.projectType,
+        a.status,
+        a.acquisitionStatus,
+        a.advanceStatus,
+        a.constructionStatus,
+        a.settStatus,
+        b.proc_ins_id
+        from xm_material_project a
+        LEFT JOIN xm_construction_clarificaiton b
+        on a.reserveProjectName = b.reserveProjectName
+        left join xm_project_assignment xpa
+        on a.reserveProjectName = xpa.reserveProjectName
         <where>
             1 = 1
             and
@@ -109,6 +117,9 @@
                 </foreach>
                 )
             </if>
+            <if test="dataScope != null and dataScope != ''">
+                ${dataScope}
+            </if>
         </where>
     </select>
 
@@ -124,7 +135,11 @@
                 a.settStatus,
                 b.proc_ins_id,
                b.the_number as 'receiveView.theNumber'
-        from xm_material_project a left join md_acquisition_process b on a.reserveProjectName = b.reserveProjectName
+        from xm_material_project a
+        left join md_acquisition_process b
+        on a.reserveProjectName = b.reserveProjectName
+        left join xm_project_assignment xpa
+        on a.reserveProjectName = xpa.reserveProjectName
         <where>
             1 = 1
             and
@@ -136,6 +151,9 @@
                 </foreach>
                 )
             </if>
+            <if test="dataScope != null and dataScope != ''">
+                ${dataScope}
+            </if>
         </where>
     </select>
     
@@ -150,7 +168,11 @@
                 a.constructionStatus,
                 a.settStatus,
                 b.proc_ins_id
-        from xm_material_project a left join xm_settlement_process b on a.reserveProjectName = b.reserveProjectName
+        from xm_material_project a
+        left join xm_settlement_process b
+        on a.reserveProjectName = b.reserveProjectName
+        left join xm_project_assignment xpa
+        on a.reserveProjectName = xpa.reserveProjectName
         <where>
             1 = 1
             and
@@ -162,6 +184,9 @@
                 </foreach>
                 )
             </if>
+            <if test="dataScope != null and dataScope != ''">
+                ${dataScope}
+            </if>
         </where>
     </select>
 
@@ -176,7 +201,11 @@
         a.constructionStatus,
         a.settStatus,
         b.proc_ins_id
-        from xm_material_project a left join xm_nonpower_process b on a.reserveProjectName = b.reserveProjectName
+        from xm_material_project a
+        left join xm_nonpower_process b
+        on a.reserveProjectName = b.reserveProjectName
+        left join xm_project_assignment xpa
+        on a.reserveProjectName = xpa.reserveProjectName
         <where>
             1 = 1
             and
@@ -188,6 +217,9 @@
                 </foreach>
                 )
             </if>
+            <if test="dataScope != null and dataScope != ''">
+                ${dataScope}
+            </if>
         </where>
     </select>
 
@@ -202,7 +234,11 @@
         a.constructionStatus,
         a.settStatus,
         b.proc_ins_id
-        from xm_material_project a left join sg_construction_process b on a.reserveProjectName = b.reserveProjectName
+        from xm_material_project a
+        left join sg_construction_process b
+        on a.reserveProjectName = b.reserveProjectName
+        left join xm_project_assignment xpa
+        on a.reserveProjectName = xpa.reserveProjectName
         <where>
             1 = 1
             and
@@ -214,6 +250,9 @@
                 </foreach>
                 )
             </if>
+            <if test="dataScope != null and dataScope != ''">
+                ${dataScope}
+            </if>
         </where>
     </select>
 </mapper>

src/main/java/com/jeeplus/modules/sg/scheduleView/web/ScheduleViewController.java

@@ -557,7 +557,7 @@ public class ScheduleViewController extends BaseController {
     }
 
     /**
-     * 项目关闭数据列表
+     * 设计变更数据列表
      */
     @ResponseBody
     @RequestMapping(value = "designData")

src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/dailyPlan/projectDailyPlanList.jsp

@@ -85,15 +85,15 @@
 
     <!-- context menu -->
     <ul id="context-menu" class="dropdown-menu">
-    	<%--<shiro:hasPermission name="sg:managementcenter:project:view">--%>
+<%--    	<shiro:hasPermission name="sg:managementcenter:project:view">--%>
         <li data-item="view"><a>查看</a></li>
-        <%--</shiro:hasPermission>--%>
-    	<%--<shiro:hasPermission name="sg:managementcenter:project:edit">--%>
+<%--        </shiro:hasPermission>--%>
+<%--    	<shiro:hasPermission name="sg:managementcenter:project:edit">--%>
         <li data-item="edit"><a>编辑</a></li>
-        <%--&lt;%&ndash;</shiro:hasPermission>&ndash;%&gt;--%>
-        <%--&lt;%&ndash;<shiro:hasPermission name="sg:managementcenter:project:del">&ndash;%&gt;--%>
+        <%--</shiro:hasPermission>--%>
+        <%--<shiro:hasPermission name="sg:managementcenter:project:del">--%>
         <li data-item="delete"><a>删除</a></li>
-        <%--&lt;%&ndash;</shiro:hasPermission>&ndash;%&gt;--%>
+        <%--</shiro:hasPermission>--%>
         <li data-item="action1"><a>取消</a></li>
     </ul>  
 	</div>