成果管理

src/main/java/com/ruoyi/project/ys/controller/YscgWjscqkController.java

@@ -37,7 +37,6 @@ public class YscgWjscqkController extends BaseController
     /**
     /**
      * 查询成果管理列表
      * 查询成果管理列表
      */
      */
-    @PreAuthorize("@ss.hasPermi('yscgWjscqk:wjscqk:list')")
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(YscgWjscqk yscgWjscqk)
     public TableDataInfo list(YscgWjscqk yscgWjscqk)
     {
     {
@@ -49,7 +48,6 @@ public class YscgWjscqkController extends BaseController
     /**
     /**
      * 导出成果管理列表
      * 导出成果管理列表
      */
      */
-    @PreAuthorize("@ss.hasPermi('yscgWjscqk:wjscqk:export')")
     @Log(title = "成果管理", businessType = BusinessType.EXPORT)
     @Log(title = "成果管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, YscgWjscqk yscgWjscqk)
     public void export(HttpServletResponse response, YscgWjscqk yscgWjscqk)
@@ -62,7 +60,6 @@ public class YscgWjscqkController extends BaseController
     /**
     /**
      * 获取成果管理详细信息
      * 获取成果管理详细信息
      */
      */
-    @PreAuthorize("@ss.hasPermi('yscgWjscqk:wjscqk:query')")
     @GetMapping(value = "/{id}")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
     {
@@ -72,7 +69,6 @@ public class YscgWjscqkController extends BaseController
     /**
     /**
      * 新增成果管理
      * 新增成果管理
      */
      */
-    @PreAuthorize("@ss.hasPermi('yscgWjscqk:wjscqk:add')")
     @Log(title = "成果管理", businessType = BusinessType.INSERT)
     @Log(title = "成果管理", businessType = BusinessType.INSERT)
     @PostMapping
     @PostMapping
     public AjaxResult add(@RequestBody YscgWjscqk yscgWjscqk)
     public AjaxResult add(@RequestBody YscgWjscqk yscgWjscqk)
@@ -83,7 +79,6 @@ public class YscgWjscqkController extends BaseController
     /**
     /**
      * 修改成果管理
      * 修改成果管理
      */
      */
-    @PreAuthorize("@ss.hasPermi('yscgWjscqk:wjscqk:edit')")
     @Log(title = "成果管理", businessType = BusinessType.UPDATE)
     @Log(title = "成果管理", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@RequestBody YscgWjscqk yscgWjscqk)
     public AjaxResult edit(@RequestBody YscgWjscqk yscgWjscqk)
@@ -94,11 +89,22 @@ public class YscgWjscqkController extends BaseController
     /**
     /**
      * 删除成果管理
      * 删除成果管理
      */
      */
-    @PreAuthorize("@ss.hasPermi('yscgWjscqk:wjscqk:remove')")
     @Log(title = "成果管理", businessType = BusinessType.DELETE)
     @Log(title = "成果管理", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     public AjaxResult remove(@PathVariable Long[] ids)
     {
     {
         return toAjax(yscgWjscqkService.deleteYscgWjscqkByIds(ids));
         return toAjax(yscgWjscqkService.deleteYscgWjscqkByIds(ids));
     }
     }
+
+
+    /**
+     * 查询共享资料列表
+     */
+    @GetMapping("/list_My")
+    public TableDataInfo gxlist(YscgWjscqk yscgWjscqk)
+    {
+        startPage();
+        List<YscgWjscqk> list = yscgWjscqkService.selectYscgWjscqkList_My(yscgWjscqk);
+        return getDataTable(list);
+    }
 }
 }

src/main/java/com/ruoyi/project/ys/domain/YscgWjscqk.java

@@ -24,6 +24,9 @@ public class YscgWjscqk extends BaseEntity
     @Excel(name = "项目id")
     @Excel(name = "项目id")
     private Long xmid;
     private Long xmid;
 
 
+    private String xmmc;
+
+
     /** 文件名称 */
     /** 文件名称 */
     @Excel(name = "文件名称")
     @Excel(name = "文件名称")
     private String wjmc;
     private String wjmc;
@@ -174,4 +177,12 @@ public class YscgWjscqk extends BaseEntity
             .append("ext3", getExt3())
             .append("ext3", getExt3())
             .toString();
             .toString();
     }
     }
+
+    public String getXmmc() {
+        return xmmc;
+    }
+
+    public void setXmmc(String xmmc) {
+        this.xmmc = xmmc;
+    }
 }
 }

src/main/java/com/ruoyi/project/ys/mapper/YscgWjscqkMapper.java

@@ -58,4 +58,6 @@ public interface YscgWjscqkMapper
      * @return 结果
      * @return 结果
      */
      */
     public int deleteYscgWjscqkByIds(Long[] ids);
     public int deleteYscgWjscqkByIds(Long[] ids);
+
+    public List<YscgWjscqk> selectYscgWjscqkList_My(YscgWjscqk yscgWjscqk);
 }
 }

src/main/java/com/ruoyi/project/ys/service/IYscgWjscqkService.java

@@ -58,4 +58,6 @@ public interface IYscgWjscqkService
      * @return 结果
      * @return 结果
      */
      */
     public int deleteYscgWjscqkById(Long id);
     public int deleteYscgWjscqkById(Long id);
+
+    public List<YscgWjscqk> selectYscgWjscqkList_My(YscgWjscqk yscgWjscqk);
 }
 }

src/main/java/com/ruoyi/project/ys/service/impl/HyjyxxServiceImpl.java

@@ -68,7 +68,7 @@ public class HyjyxxServiceImpl implements IHyjyxxService
     @Override
     @Override
     public int insertHyjyxx(Hyjyxx hyjyxx)
     public int insertHyjyxx(Hyjyxx hyjyxx)
     {
     {
-        hyjyxx.setCreateBy(getUserId()+"");
+        hyjyxx.setCreatedBy(getUserId()+"");
         hyjyxx.setCreatedTime(DateUtils.getNowDate());
         hyjyxx.setCreatedTime(DateUtils.getNowDate());
         return hyjyxxMapper.insertHyjyxx(hyjyxx);
         return hyjyxxMapper.insertHyjyxx(hyjyxx);
     }
     }

src/main/java/com/ruoyi/project/ys/service/impl/YscgWjscqkServiceImpl.java

@@ -8,6 +8,8 @@ import com.ruoyi.project.ys.mapper.YscgWjscqkMapper;
 import com.ruoyi.project.ys.domain.YscgWjscqk;
 import com.ruoyi.project.ys.domain.YscgWjscqk;
 import com.ruoyi.project.ys.service.IYscgWjscqkService;
 import com.ruoyi.project.ys.service.IYscgWjscqkService;
 
 
+import static com.ruoyi.common.utils.SecurityUtils.getUserId;
+
 /**
 /**
  * 成果管理Service业务层处理
  * 成果管理Service业务层处理
  * 
  * 
@@ -53,6 +55,8 @@ public class YscgWjscqkServiceImpl implements IYscgWjscqkService
     @Override
     @Override
     public int insertYscgWjscqk(YscgWjscqk yscgWjscqk)
     public int insertYscgWjscqk(YscgWjscqk yscgWjscqk)
     {
     {
+        yscgWjscqk.setCreatedBy(getUserId()+"");
+        yscgWjscqk.setCreatedTime(DateUtils.getNowDate());
         return yscgWjscqkMapper.insertYscgWjscqk(yscgWjscqk);
         return yscgWjscqkMapper.insertYscgWjscqk(yscgWjscqk);
     }
     }
 
 
@@ -65,6 +69,7 @@ public class YscgWjscqkServiceImpl implements IYscgWjscqkService
     @Override
     @Override
     public int updateYscgWjscqk(YscgWjscqk yscgWjscqk)
     public int updateYscgWjscqk(YscgWjscqk yscgWjscqk)
     {
     {
+        yscgWjscqk.setUpdateBy(getUserId()+"");
         yscgWjscqk.setUpdateTime(DateUtils.getNowDate());
         yscgWjscqk.setUpdateTime(DateUtils.getNowDate());
         return yscgWjscqkMapper.updateYscgWjscqk(yscgWjscqk);
         return yscgWjscqkMapper.updateYscgWjscqk(yscgWjscqk);
     }
     }
@@ -92,4 +97,13 @@ public class YscgWjscqkServiceImpl implements IYscgWjscqkService
     {
     {
         return yscgWjscqkMapper.deleteYscgWjscqkById(id);
         return yscgWjscqkMapper.deleteYscgWjscqkById(id);
     }
     }
+
+    /**登陆人能看到的
+
+     */
+    @Override
+    public List<YscgWjscqk> selectYscgWjscqkList_My(YscgWjscqk yscgWjscqk)
+    {
+        return yscgWjscqkMapper.selectYscgWjscqkList_My(yscgWjscqk);
+    }
 }
 }

src/main/java/com/ruoyi/project/ys/service/impl/YsqqXmxxServiceImpl.java

@@ -80,7 +80,6 @@ public class YsqqXmxxServiceImpl implements IYsqqXmxxService
     {
     {
         ysqqXmxx.setUpdateBy(getUserId()+"");
         ysqqXmxx.setUpdateBy(getUserId()+"");
         ysqqXmxx.setUpdateTime(DateUtils.getNowDate());
         ysqqXmxx.setUpdateTime(DateUtils.getNowDate());
-        ysqqXmxx.setUpdateTime(DateUtils.getNowDate());
         return ysqqXmxxMapper.updateYsqqXmxx(ysqqXmxx);
         return ysqqXmxxMapper.updateYsqqXmxx(ysqqXmxx);
     }
     }
 
 

src/main/java/com/ruoyi/project/ys/service/impl/YsqqXmxxXmcyServiceImpl.java

@@ -8,6 +8,8 @@ import com.ruoyi.project.ys.mapper.YsqqXmxxXmcyMapper;
 import com.ruoyi.project.ys.domain.YsqqXmxxXmcy;
 import com.ruoyi.project.ys.domain.YsqqXmxxXmcy;
 import com.ruoyi.project.ys.service.IYsqqXmxxXmcyService;
 import com.ruoyi.project.ys.service.IYsqqXmxxXmcyService;
 
 
+import static com.ruoyi.common.utils.SecurityUtils.getUserId;
+
 /**
 /**
  * 验收前期-项目信息-项目成员Service业务层处理
  * 验收前期-项目信息-项目成员Service业务层处理
  * 
  * 
@@ -53,6 +55,8 @@ public class YsqqXmxxXmcyServiceImpl implements IYsqqXmxxXmcyService
     @Override
     @Override
     public int insertYsqqXmxxXmcy(YsqqXmxxXmcy ysqqXmxxXmcy)
     public int insertYsqqXmxxXmcy(YsqqXmxxXmcy ysqqXmxxXmcy)
     {
     {
+        ysqqXmxxXmcy.setCreatedBy(getUserId()+"");
+        ysqqXmxxXmcy.setCreatedTime(DateUtils.getNowDate());
         return ysqqXmxxXmcyMapper.insertYsqqXmxxXmcy(ysqqXmxxXmcy);
         return ysqqXmxxXmcyMapper.insertYsqqXmxxXmcy(ysqqXmxxXmcy);
     }
     }
 
 
@@ -65,6 +69,7 @@ public class YsqqXmxxXmcyServiceImpl implements IYsqqXmxxXmcyService
     @Override
     @Override
     public int updateYsqqXmxxXmcy(YsqqXmxxXmcy ysqqXmxxXmcy)
     public int updateYsqqXmxxXmcy(YsqqXmxxXmcy ysqqXmxxXmcy)
     {
     {
+        ysqqXmxxXmcy.setUpdateBy(getUserId()+"");
         ysqqXmxxXmcy.setUpdateTime(DateUtils.getNowDate());
         ysqqXmxxXmcy.setUpdateTime(DateUtils.getNowDate());
         return ysqqXmxxXmcyMapper.updateYsqqXmxxXmcy(ysqqXmxxXmcy);
         return ysqqXmxxXmcyMapper.updateYsqqXmxxXmcy(ysqqXmxxXmcy);
     }
     }

src/main/resources/mybatis/yscgWjscqk/YscgWjscqkMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="YscgWjscqk" id="YscgWjscqkResult">
     <resultMap type="YscgWjscqk" id="YscgWjscqkResult">
         <result property="id"    column="id"    />
         <result property="id"    column="id"    />
         <result property="xmid"    column="xmid"    />
         <result property="xmid"    column="xmid"    />
+        <result property="xmmc"    column="xmmc"    />
         <result property="wjmc"    column="wjmc"    />
         <result property="wjmc"    column="wjmc"    />
         <result property="zllx"    column="zllx"    />
         <result property="zllx"    column="zllx"    />
         <result property="wjlj"    column="wjlj"    />
         <result property="wjlj"    column="wjlj"    />
@@ -101,4 +102,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
             #{id}
         </foreach>
         </foreach>
     </delete>
     </delete>
+
+    <select id="selectYscgWjscqkList_My" parameterType="YscgWjscqk" resultMap="YscgWjscqkResult">
+        select * from (select b.xmmc ,a.id, a.xmid, a.wjmc, a.zllx, a.wjlj,
+        a.created_by, a.created_time, a.update_by, a.update_time, a.ext1, a.ext2, a.ext3
+        from yscg_wjscqk a
+        left join ysqq_xmxx b on a.xmid = b.id
+        where 1=1
+
+        <if test="createdBy != null  and createdBy != ''">
+            and (b.id in (select zbid from ysqq_xmxx_xmcy where user_id =#{createdBy})
+            or b.created_by = #{createdBy}
+            )
+         </if>
+        union
+
+        select b.xmmc ,a.id, a.xmid, a.wjmc, a.zllx, a.wjlj,
+        a.created_by, a.created_time, a.update_by, a.update_time, a.ext1, a.ext2, a.ext3
+        from yscg_wjscqk a
+        left join ysqq_xmxx b on a.xmid = b.id
+        left join yscg_file_role c on a.id = c.fileid
+        where 1=1
+        <if test="createdBy != null  and createdBy != ''">
+            c.user_id =#{createdBy}
+        </if>
+        )  A
+        <where>
+            <if test="xmid != null "> and xmid = #{xmid}</if>
+            <if test="wjmc != null  and wjmc != ''"> and wjmc = #{wjmc}</if>
+            <if test="xmmc != null  and xmmc != ''"> and xmmc like concat('%', #{xmmc}, '%')</if>
+            <if test="zllx != null  and zllx != ''"> and zllx = #{zllx}</if>
+            <if test="wjlj != null  and wjlj != ''"> and wjlj = #{wjlj}</if>
+            <if test="createdTime != null "> and created_time = #{createdTime}</if>
+            <if test="ext1 != null  and ext1 != ''"> and ext1 = #{ext1}</if>
+            <if test="ext2 != null  and ext2 != ''"> and ext2 = #{ext2}</if>
+            <if test="ext3 != null  and ext3 != ''"> and ext3 = #{ext3}</if>
+        </where>
+    </select>
 </mapper>
 </mapper>
\ No newline at end of file