招商引资_情况月统计表

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

@@ -80,7 +80,7 @@ public class ZsyzQktjController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody ZsyzQktj zsyzQktj)
     {
-        return toAjax(zsyzQktjService.insertZsyzQktj(zsyzQktj));
+        return zsyzQktjService.insertZsyzQktj(zsyzQktj);
     }
 
     /**
@@ -88,7 +88,7 @@ public class ZsyzQktjController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:qktj:edit')")
     @Log(title = "招商引资_情况月统计", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@RequestBody ZsyzQktj zsyzQktj)
     {
         return toAjax(zsyzQktjService.updateZsyzQktj(zsyzQktj));
@@ -99,7 +99,7 @@ public class ZsyzQktjController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:qktj:remove')")
     @Log(title = "招商引资_情况月统计", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+	@GetMapping("/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(zsyzQktjService.deleteZsyzQktjByIds(ids));

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/projectV2/common/ZsyzCommonServiceImpL.java

@@ -789,8 +789,6 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         //Long deptId = SecurityUtils.getDeptId();
         //SysUser user = SecurityUtils.getLoginUser().getUser();
         List<Map<String, Object>> mapList = new ArrayList<>();
-        //定义返回值
-        int sk = 0;
         SysUser currentUser = SecurityUtils.getLoginUser().getUser();
         String roleKey = "";
         // 如果是超级管理员/管理员，则不过滤数据
@@ -822,15 +820,19 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
                         //部门存在数据
                         Long zswcYear =0L;//招商外出天数(年)
                         Long sjksYear =0L;//对接客商次数(年)
+                        Long zswcMonth =0L;//招商外出天数(年)
+                        Long sjksMonth =0L;//对接客商次数(年)
                         for (ZsyzQktj qktj : zsyzQktjBmMap.get(sysDept.getDeptId())) {
                             zswcYear = zswcYear + qktj.getNumberOutings();
                             sjksYear = sjksYear + qktj.getNumberDocking();
                             if(qktj.getMonth().equals(month)){
-                                mapMonth.put("zswcMonth",qktj.getNumberOutings());//招商外出天数(月)
-                                mapMonth.put("sjksMonth",qktj.getNumberDocking());//对接客商次数(月)
+                                zswcMonth = qktj.getNumberOutings();
+                                sjksMonth = qktj.getNumberDocking();
                             }
 
                         }
+                        mapMonth.put("zswcMonth",zswcMonth);//招商外出天数(月)
+                        mapMonth.put("sjksMonth",sjksMonth);//对接客商次数(月)
                         mapMonth.put("zswcYear",zswcYear);//招商外出天数(年)
                         mapMonth.put("sjksYear",sjksYear);//对接客商次数(年)
                     }else{

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

@@ -1,6 +1,7 @@
 package com.ruoyi.system.service.impl.projectV2;
 
 import com.ruoyi.common.constant.CommonConstants;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -61,7 +62,14 @@ public class ZsyzQktjServiceImpl implements IZsyzQktjService {
      */
     @Override
     public ZsyzQktj selectZsyzQktjById(Long id) {
-        return zsyzQktjMapper.selectZsyzQktjById(id);
+        ZsyzQktj zsyzQktj = zsyzQktjMapper.selectZsyzQktjById(id);
+        if(zsyzQktj.getZsyzFjList().size()<=0){
+            zsyzQktj.setZsyzFjList(new ArrayList<>());
+        }
+        if(zsyzQktj.getZsyzFjList().size()==1 && StringUtils.isEmpty(zsyzQktj.getZsyzFjList().get(0).getPath())){
+            zsyzQktj.setZsyzFjList(new ArrayList<>());
+        }
+        return zsyzQktj ;
     }
 
     /**
@@ -83,8 +91,19 @@ public class ZsyzQktjServiceImpl implements IZsyzQktjService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int insertZsyzQktj(ZsyzQktj zsyzQktj) {
+    public AjaxResult insertZsyzQktj(ZsyzQktj zsyzQktj) {
         SysUser user = SecurityUtils.getLoginUser().getUser();
+
+        //查询库里是否存在数据
+        ZsyzQktj qktj = new ZsyzQktj();
+        qktj.setMonth(zsyzQktj.getMonth());
+        qktj.setYear(zsyzQktj.getYear());
+        qktj.setDeptId(user.getDeptId());
+        List<ZsyzQktj> zsyzQktjList = zsyzQktjMapper.selectZsyzQktjList(qktj);
+        if(zsyzQktjList.size()>0){
+            return AjaxResult.error("当前月份数据已存在，请勿重复新增");
+        }
+
         zsyzQktj.setDeptId(user.getDeptId());
         zsyzQktj.setDeptName(user.getDept().getDeptName());
         zsyzQktj.setCreateTime(DateUtils.getNowDate());
@@ -108,7 +127,7 @@ public class ZsyzQktjServiceImpl implements IZsyzQktjService {
                 }
             }
         }
-        return count;
+        return AjaxResult.success("新增成功 ");
     }
 
     /**
@@ -121,21 +140,19 @@ public class ZsyzQktjServiceImpl implements IZsyzQktjService {
     public int updateZsyzQktj(ZsyzQktj zsyzQktj) {
         zsyzQktj.setUpdateTime(DateUtils.getNowDate());
         //修改附件
-        if (zsyzQktj.getZsyzFjList() != null && zsyzQktj.getZsyzFjList().size() > 0) {
-            ZsyzFj zsyzFjDelete = new ZsyzFj();
-            zsyzFjDelete.setSourceId(zsyzQktj.getId());
-            zsyzFjDelete.setType(CommonConstants.SIX);
-            //先删除相关附件
-            zsyzFjMapper.deleteZsyzFjBySourceId(zsyzFjDelete);
-            //再将文件新增进数据库
-            List<ZsyzFj> zsyzFjList = zsyzQktj.getZsyzFjList();
-            if (zsyzFjList != null) {
-                for (ZsyzFj zsyzFj : zsyzFjList) {
-                    zsyzFj.setSourceId(zsyzQktj.getId());
-                    zsyzFj.setType(CommonConstants.SIX);
-                    zsyzFj.setXmId(0L);
-                    zsyzFjMapper.insertZsyzFj(zsyzFj);
-                }
+        ZsyzFj zsyzFjDelete = new ZsyzFj();
+        zsyzFjDelete.setSourceId(zsyzQktj.getId());
+        zsyzFjDelete.setType(CommonConstants.SIX);
+        //先删除相关附件
+        zsyzFjMapper.deleteZsyzFjBySourceId(zsyzFjDelete);
+        //再将文件新增进数据库
+        List<ZsyzFj> zsyzFjList = zsyzQktj.getZsyzFjList();
+        if (zsyzFjList != null) {
+            for (ZsyzFj zsyzFj : zsyzFjList) {
+                zsyzFj.setSourceId(zsyzQktj.getId());
+                zsyzFj.setType(CommonConstants.SIX);
+                zsyzFj.setXmId(0L);
+                zsyzFjMapper.insertZsyzFj(zsyzFj);
             }
         }
         return zsyzQktjMapper.updateZsyzQktj(zsyzQktj);
@@ -167,7 +184,7 @@ public class ZsyzQktjServiceImpl implements IZsyzQktjService {
     public List<ZsyzQktjDc> selectZsyzQktjListTj(ZsyzQktj zsyzQktj) {
 
 
-        return statisticsMonth(zsyzQktj.getYear(),zsyzQktj.getMonth());
+        return statisticsMonth(zsyzQktj.getYear(), zsyzQktj.getMonth());
     }
 
 
@@ -288,7 +305,7 @@ public class ZsyzQktjServiceImpl implements IZsyzQktjService {
                 //yxxsMonth = yxxsMonth + zsyzQktjDc.getZsyzQktjYxxsList().get(0).getYxxsMonth();
                 //yxxsYear = yxxsYear + zsyzQktjDc.getZsyzQktjYxxsList().get(0).getYxxsYear();
 
-                zswcMonth = zswcMonth +zsyzQktjDc.getZswcMonth();
+                zswcMonth = zswcMonth + zsyzQktjDc.getZswcMonth();
                 zswcYear = zswcYear + zsyzQktjDc.getZswcYear();
                 sjksMonth = sjksMonth + zsyzQktjDc.getSjksMonth();
                 sjksYear = sjksYear + zsyzQktjDc.getSjksYear();

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

@@ -2,6 +2,7 @@ package com.ruoyi.system.service.projectV2;
 
 import java.util.List;
 
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain.projectV2.Vo.ZsyzQktjDc;
 import com.ruoyi.system.domain.projectV2.ZsyzQktj;
 
@@ -35,7 +36,7 @@ public interface IZsyzQktjService
      * @param zsyzQktj 招商引资_情况月统计
      * @return 结果
      */
-    public int insertZsyzQktj(ZsyzQktj zsyzQktj);
+    public AjaxResult insertZsyzQktj(ZsyzQktj zsyzQktj);
 
     /**
      * 修改招商引资_情况月统计

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

@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectZsyzQktjVo">
         select q.id, q.dept_id, q.dept_name, q.year, q.month, q.number_outings, q.number_docking, q.details, q.create_by, q.create_time, q.update_by, q.update_time, q.remark,
-               f.id, f.xm_id, f.xmbh, f.source_id, f.fj_name, f.path, f.type
+               f.id,f.xm_id, f.xmbh, f.source_id, f.fj_name, f.path, f.type
         from zsyz_qktj q
         left join zsyz_fj f on q.id = f.source_id
     </sql>
@@ -54,9 +54,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectZsyzQktjById" parameterType="Long" resultMap="ZsyzQktjResult">
-        <include refid="selectZsyzQktjVo"/>
-        where q.
-id = #{id}
+        select q.id, q.dept_id, q.dept_name, q.year, q.month, q.number_outings, q.number_docking, q.details, q.create_by, q.create_time, q.update_by, q.update_time, q.remark,
+               f.id ,f.xm_id, f.xmbh, f.source_id, f.fj_name, f.path, f.type
+        from zsyz_qktj q
+        left join zsyz_fj f on q.id = f.source_id
+        where q.id = #{id}
     </select>
         
     <insert id="insertZsyzQktj" parameterType="ZsyzQktj" useGeneratedKeys="true" keyProperty="id">