新增引荐单位列表

ruoyi-admin/src/main/java/com/ruoyi/web/controller/projectV2/ZsyzSbbzbController.java

@@ -42,6 +42,17 @@ public class ZsyzSbbzbController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询招商引资_申报_首谈信息_主列表_招商引资单位单独列表
+     */
+    @GetMapping("/listYz")
+    public TableDataInfo listYz(ZsyzSbbzb zsyzSbbzb)
+    {
+        startPage();
+        List<ZsyzSbbzb> list = zsyzSbbzbService.selectZsyzSbbzbListYz(zsyzSbbzb);
+        return getDataTable(list);
+    }
+
     /**
      * 领导批示列表
      */

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -140,7 +140,7 @@ public class SysUserController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@Validated @RequestBody SysUser user) {
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getUserId());
@@ -162,7 +162,7 @@ public class SysUserController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:user:remove')")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{userIds}")
+    @GetMapping("/delete/{userIds}")
     public AjaxResult remove(@PathVariable Long[] userIds) {
         if (ArrayUtils.contains(userIds, getUserId())) {
             return error("当前用户不能删除");
@@ -175,7 +175,7 @@ public class SysUserController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-    @PutMapping("/resetPwd")
+    @PostMapping("/resetPwd")
     public AjaxResult resetPwd(@RequestBody SysUser user) {
         userService.checkUserAllowed(user);
         if (ONE.equals(userService.checkStrongPwd(user))) {
@@ -192,7 +192,7 @@ public class SysUserController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-    @PutMapping("/changeStatus")
+    @PostMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody SysUser user) {
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getUserId());
@@ -219,7 +219,7 @@ public class SysUserController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
-    @PutMapping("/authRole")
+    @PostMapping("/authRole")
     public AjaxResult insertAuthRole(Long userId, Long[] roleIds) {
         userService.checkUserDataScope(userId);
         userService.insertUserAuth(userId, roleIds);

ruoyi-system/src/main/java/com/ruoyi/system/mapper/projectV2/ZsyzSbbzbMapper.java

@@ -37,6 +37,11 @@ public interface ZsyzSbbzbMapper
      */
     public List<ZsyzSbbzb> selectZsyzSbbzbListByZp(ZsyzSbbzb zsyzSbbzb);
 
+    /**
+     * 查询招商引资_申报_首谈信息_主列表_招商引资单位单独列表
+     */
+    public List<ZsyzSbbzb> selectZsyzSbbzbListYz(ZsyzSbbzb zsyzSbbzb);
+
     /**
      * 首页统计查询只查询承接地信息
      * @param zsyzSbbzb

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/projectV2/ZsyzJzqkServiceImpl.java

@@ -62,7 +62,19 @@ public class ZsyzJzqkServiceImpl implements IZsyzJzqkService
     @Override
     public List<ZsyzJzqk> selectZsyzJzqkList(ZsyzJzqk zsyzJzqk)
     {
-        return zsyzJzqkMapper.selectZsyzJzqkList(zsyzJzqk);
+        List<ZsyzJzqk> zsyzJzqks = zsyzJzqkMapper.selectZsyzJzqkList(zsyzJzqk);
+        if (zsyzJzqks != null) {
+            for (ZsyzJzqk jzqk : zsyzJzqks) {
+                ZsyzFj zsyzFj = new ZsyzFj();
+                zsyzFj.setSourceId(jzqk.getId());
+                zsyzFj.setType(FIV);
+                List<ZsyzFj> zsyzFjList = zsyzFjMapper.selectZsyzFjList(zsyzFj);
+                if (zsyzFjList != null && zsyzFjList.size() > 0) {
+                    jzqk.setZsyzFjList(zsyzFjList);
+                }
+            }
+        }
+        return zsyzJzqks;
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/projectV2/ZsyzSbbzbServiceImpl.java

@@ -107,6 +107,16 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
         return zsyzSbbzbs;
     }
 
+    /**
+     * 查询招商引资_申报_首谈信息_主列表_招商引资单位单独列表
+     */
+    @Override
+    public List<ZsyzSbbzb> selectZsyzSbbzbListYz(ZsyzSbbzb zsyzSbbzb) {
+        zsyzSbbzb.setDeptId(SecurityUtils.getDeptId());
+        List<ZsyzSbbzb> zsyzSbbzbs = zsyzSbbzbMapper.selectZsyzSbbzbListYz(zsyzSbbzb);
+        return zsyzSbbzbs;
+    }
+
     /**
      * 新增招商引资_申报_首谈信息_主
      *

ruoyi-system/src/main/java/com/ruoyi/system/service/projectV2/IZsyzSbbzbService.java

@@ -28,6 +28,10 @@ public interface IZsyzSbbzbService
      * @return 招商引资_申报_首谈信息_主集合
      */
     public List<ZsyzSbbzb> selectZsyzSbbzbList(ZsyzSbbzb zsyzSbbzb);
+    /**
+     * 查询招商引资_申报_首谈信息_主列表_招商引资单位单独列表
+     */
+    public List<ZsyzSbbzb> selectZsyzSbbzbListYz(ZsyzSbbzb zsyzSbbzb);
 
     /**
      * 新增招商引资_申报_首谈信息_主

ruoyi-system/src/main/resources/mapper/system/projectV2/ZsyzSbbzbMapper.xml

@@ -665,6 +665,72 @@
         order by create_time desc
     </select>
 
+    <select id="selectZsyzSbbzbListYz" resultType="com.ruoyi.system.domain.projectV2.ZsyzSbbzb">
+        select s.id,
+        s.sbdw,
+        s.tbrq,
+        s.zszxfzr,
+        s.xmbh,
+        s.xmxsmc,
+        s.sfwlhxxxm,
+        s.yzdq_id,
+        s.yzdq_name,
+        s.yzss_name,
+        s.ntze,
+        s.cylx_id,
+        s.cylx_name,
+        s.xmlb,
+        s.tzlb,
+        s.nlhd,
+        s.czpt,
+        s.tzzt,
+        s.xmjz,
+        s.gtzzrsfzhm,
+        s.qytzrxyzdm,
+        s.qybj,
+        s.tzfjj,
+        s.sndxse,
+        s.sndnse,
+        s.tzrxm,
+        s.tzrzw,
+        s.tzrdh,
+        s.xmjj,
+        s.name,
+        s.strq,
+        s.phone,
+        s.zw,
+        s.user_id,
+        s.create_by,
+        s.type,
+        s.progress,
+        s.xm_status,
+        s.dept_id,
+        s.create_time,
+        s.update_by,
+        s.is_del,
+        s.update_time,
+        s.remark,
+        s.cjd_id,
+        s.cjd_name,
+        s.is_meet,
+        s.meet_remark
+        from zsyz_project_dept d
+        left join zsyz_sbbzb s on s.id = d.xm_id
+        where s.is_del = 'N'
+        and d.dept_id = #{deptId} and d.is_del = 'N' and d.dept_type = '3'
+        <if test="xmxsmc != null  and xmxsmc != ''">and s.xmxsmc = #{xmxsmc}</if>
+        <if test="progress != null  and progress != ''">and find_in_set(s.progress , #{progress})</if>
+        <if test="xmStatus != null  and xmStatus != ''">and s.xm_status = #{xmStatus}</if>
+        <if test="cjdId != null ">and cjd_id = #{cjdId}</if>
+        <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+            AND date_format(s.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+        </if>
+        <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+            AND date_format(s.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+        </if>
+        order by d.create_time desc
+    </select>
+
 
     <insert id="insertZsyzSbbzb" parameterType="ZsyzSbbzb" useGeneratedKeys="true" keyProperty="id">
         insert into zsyz_sbbzb