规划编制,收集意见

unis-plugin/unis-plugin-biz/pom.xml

@@ -48,10 +48,6 @@
             <artifactId>unis-plugin-auth</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.unis</groupId>
-            <artifactId>unis-plugin-dev</artifactId>
-        </dependency>
     </dependencies>
 
 </project>

unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/unitInfo/service/impl/UnitInfoServiceImpl.java

@@ -119,7 +119,6 @@ public class UnitInfoServiceImpl extends ServiceImpl<UnitInfoMapper, UnitInfo> i
             throw new CommonException("单位管理信息新增操作数据库失败");
         }
 
-
     }
 
     @Transactional(rollbackFor = Exception.class)

unis-plugin/unis-plugin-biz/src/main/java/com/unis/policy/info/modular/mlpAdviceCollect/controller/MlpAdviceCollectController.java

@@ -60,7 +60,7 @@ public class MlpAdviceCollectController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取中长期规划管理-规划编制（意见收集）分页")
-    @SaCheckPermission("/policy.info/mlpAdviceCollect/page")
+   // @SaCheckPermission("/policy.info/mlpAdviceCollect/page")
     @GetMapping("/policy.info/mlpAdviceCollect/page")
     public CommonResult<Page<MlpAdviceCollect>> page(MlpAdviceCollectPageParam mlpAdviceCollectPageParam) {
         return CommonResult.data(mlpAdviceCollectService.page(mlpAdviceCollectPageParam));
@@ -75,7 +75,7 @@ public class MlpAdviceCollectController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加中长期规划管理-规划编制（意见收集）")
     @CommonLog("添加中长期规划管理-规划编制（意见收集）")
-    @SaCheckPermission("/policy.info/mlpAdviceCollect/add")
+   // @SaCheckPermission("/policy.info/mlpAdviceCollect/add")
     @PostMapping("/policy.info/mlpAdviceCollect/add")
     public CommonResult<String> add(@RequestBody @Valid MlpAdviceCollectAddParam mlpAdviceCollectAddParam) {
         mlpAdviceCollectService.add(mlpAdviceCollectAddParam);
@@ -91,7 +91,7 @@ public class MlpAdviceCollectController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑中长期规划管理-规划编制（意见收集）")
     @CommonLog("编辑中长期规划管理-规划编制（意见收集）")
-    @SaCheckPermission("/policy.info/mlpAdviceCollect/edit")
+   // @SaCheckPermission("/policy.info/mlpAdviceCollect/edit")
     @PostMapping("/policy.info/mlpAdviceCollect/edit")
     public CommonResult<String> edit(@RequestBody @Valid MlpAdviceCollectEditParam mlpAdviceCollectEditParam) {
         mlpAdviceCollectService.edit(mlpAdviceCollectEditParam);
@@ -107,7 +107,7 @@ public class MlpAdviceCollectController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除中长期规划管理-规划编制（意见收集）")
     @CommonLog("删除中长期规划管理-规划编制（意见收集）")
-    @SaCheckPermission("/policy.info/mlpAdviceCollect/delete")
+  //  @SaCheckPermission("/policy.info/mlpAdviceCollect/delete")
     @PostMapping("/policy.info/mlpAdviceCollect/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<MlpAdviceCollectIdParam> mlpAdviceCollectIdParamList) {
@@ -123,7 +123,7 @@ public class MlpAdviceCollectController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取中长期规划管理-规划编制（意见收集）详情")
-    @SaCheckPermission("/policy.info/mlpAdviceCollect/detail")
+   // @SaCheckPermission("/policy.info/mlpAdviceCollect/detail")
     @GetMapping("/policy.info/mlpAdviceCollect/detail")
     public CommonResult<MlpAdviceCollect> detail(@Valid MlpAdviceCollectIdParam mlpAdviceCollectIdParam) {
         return CommonResult.data(mlpAdviceCollectService.detail(mlpAdviceCollectIdParam));

unis-plugin/unis-plugin-biz/src/main/java/com/unis/policy/info/modular/mlpAdviceCollect/mapper/MlpAdviceCollectMapper.java

@@ -14,6 +14,7 @@ package com.unis.policy.info.modular.mlpAdviceCollect.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.unis.policy.info.modular.mlpAdviceCollect.entity.MlpAdviceCollect;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 中长期规划管理-规划编制（意见收集）Mapper接口
@@ -21,5 +22,6 @@ import com.unis.policy.info.modular.mlpAdviceCollect.entity.MlpAdviceCollect;
  * @author hujinachun
  * @date  2024/04/18 18:02
  **/
+@Mapper
 public interface MlpAdviceCollectMapper extends BaseMapper<MlpAdviceCollect> {
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/policy/info/modular/mlpAdviceCollect/mapper/MlpAdviceCollectOrgMapper.java

@@ -15,6 +15,7 @@ package com.unis.policy.info.modular.mlpAdviceCollect.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.unis.policy.info.modular.mlpAdviceCollect.entity.MlpAdviceCollectOrg;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 中长期规划管理-规划编制（意见收集）Mapper接口
@@ -22,5 +23,6 @@ import com.unis.policy.info.modular.mlpAdviceCollect.entity.MlpAdviceCollectOrg;
  * @author hujinachun
  * @date  2024/04/19 00:22
  **/
+@Mapper
 public interface MlpAdviceCollectOrgMapper extends BaseMapper<MlpAdviceCollectOrg> {
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/policy/info/modular/mlpAdviceCollect/param/MlpAdviceCollectAddParam.java

@@ -15,6 +15,7 @@ package com.unis.policy.info.modular.mlpAdviceCollect.param;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.constraints.NotBlank;
@@ -45,7 +46,7 @@ public class MlpAdviceCollectAddParam {
 
     /** 意见收集截止时间 */
     @ApiModelProperty(value = "意见收集截止时间", position = 9)
-    private LocalDateTime collectionDeadline;
+    private Date collectionDeadline;
 
     /** 规划正文 */
     @ApiModelProperty(value = "规划正文", position = 10)
@@ -55,6 +56,6 @@ public class MlpAdviceCollectAddParam {
     /** 附件链接或名称  支持多个上传文件 */
     @ApiModelProperty(value = "附件链接或名称", position = 11)
     @NotBlank(message = "附件不能为空")
-    private List<MultipartFile> attachment;
+    private String attachment;
 
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/policy/info/modular/mlpAdviceCollect/service/impl/MlpAdviceCollectServiceImpl.java

@@ -23,9 +23,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.unis.auth.core.util.StpClientUtil;
 import com.unis.auth.core.util.StpLoginUserUtil;
-import com.unis.auth.modular.login.entity.UserCollectLogin;
-import com.unis.dev.modular.file.enums.DevFileEngineTypeEnum;
-import com.unis.dev.modular.file.service.DevFileService;
 import com.unis.policy.info.modular.mlpAdviceCollect.entity.MlpAdviceCollectOrg;
 import com.unis.policy.info.modular.mlpAdviceCollect.mapper.MlpAdviceCollectOrgMapper;
 import com.unis.sys.modular.org.entity.SysOrg;
@@ -75,9 +72,6 @@ public class MlpAdviceCollectServiceImpl extends ServiceImpl<MlpAdviceCollectMap
     private MlpAdviceCollectMapper mlpAdviceCollectMapper;
 
     @Autowired
-    private DevFileService devFileService;
-
-    @Autowired
     private MlpAdviceCollectOrgMapper mlpAdviceCollectOrgMapper;
 
 
@@ -127,11 +121,7 @@ public class MlpAdviceCollectServiceImpl extends ServiceImpl<MlpAdviceCollectMap
             MlpAdviceCollect mlpAdviceCollect = new MlpAdviceCollect();
             BeanUtils.copyProperties(addParam, mlpAdviceCollect);
             mlpAdviceCollect.setSysOrgId(orgId);
-
-            //上传到minio 返回路径，存数据库
-            /*String url = devFileService.uploadReturnUrl(DevFileEngineTypeEnum.MINIO.getValue(),);
-            mlpAdviceCollect.setAttachment(url);*/
-
+            mlpAdviceCollect.setAttachment(addParam.getAttachment());
             mlpAdviceCollect.setCreateTime(new Date());
             try {
                 mlpAdviceCollectMapper.insert(mlpAdviceCollect);

unis-plugin/unis-plugin-sys/src/main/java/com/unis/sys/modular/org/mapper/SysOrgMapper.java

@@ -15,6 +15,7 @@ package com.unis.sys.modular.org.mapper;
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.unis.sys.modular.org.entity.SysOrg;
 
@@ -24,6 +25,7 @@ import com.unis.sys.modular.org.entity.SysOrg;
  * @author xuyuxiang
  * @date 2022/4/21 18:37
  **/
+@Mapper
 public interface SysOrgMapper extends BaseMapper<SysOrg> {
 
     /**

unis-plugin/unis-plugin-sys/src/main/java/com/unis/sys/modular/user/mapper/SysUserMapper.java

@@ -15,6 +15,7 @@ package com.unis.sys.modular.user.mapper;
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.unis.sys.modular.user.entity.SysUser;
 
@@ -24,6 +25,7 @@ import com.unis.sys.modular.user.entity.SysUser;
  * @author xuyuxiang
  * @date 2022/4/21 18:37
  **/
+@Mapper
 public interface SysUserMapper extends BaseMapper<SysUser> {
 
     /**