添加手机端流程配置

src/main/java/com/xjrsoft/module/material/service/impl/MaterialTaskServiceImpl.java

@@ -140,21 +140,13 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
 
             MaterialTaskAssign materialTaskAssign = materialTaskMaterialTaskAssignMapper.selectByIdDeep(materialTaskAssignAppendixDto.getMaterialTaskAssignId());
             Integer oldStatus = materialTaskAssign.getStatus();
+            materialTaskAssign.setStatus(2);
             if (oldStatus == 1) {
-                materialTaskAssign.setStatus(2);
                 MaterialTask materialTask = materialTaskMaterialTaskMapper.selectByIdDeep(materialTaskAssign.getMaterialTaskId());
-//                if (LocalDate.now().compareTo(materialTask.getRequiredCompleteTime()) > 0) {
-//                    materialTaskAssign.setExecutiveStatus(2);
-//                    materialTask.setOnTimePerson(materialTask.getOnTimePerson() + 1);
-//                } else {
-//                    materialTaskAssign.setExecutiveStatus(3);
-//                    materialTask.setTimeDelay(materialTask.getTimeDelay() + 1);
-//                }
-
-                materialTaskMaterialTaskAssignMapper.updateById(materialTaskAssign);
                 materialTask.setSubmitedPerson(materialTask.getSubmitedPerson() + 1);
                 materialTaskMaterialTaskMapper.updateById(materialTask);
             }
+            materialTaskMaterialTaskAssignMapper.updateById(materialTaskAssign);
 
             if (oldStatus == 4) { // 重做删除原来的
                 materialTaskMaterialTaskAppendixMapper.delete(Wrappers.lambdaQuery(MaterialTaskAppendix.class).eq(MaterialTaskAppendix::getMaterialTaskId, materialTaskAssignAppendixDto.getMaterialTaskAssignId()));

src/main/java/com/xjrsoft/module/system/controller/BaseMobileWorkflowConfigController.java

@@ -0,0 +1,103 @@
+package com.xjrsoft.module.system.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.xjrsoft.common.constant.GlobalConstant;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.system.dto.AddBaseMobileWorkflowConfigDto;
+import com.xjrsoft.module.system.dto.UpdateBaseMobileWorkflowConfigDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+import com.xjrsoft.module.system.dto.BaseMobileWorkflowConfigListDto;
+import com.xjrsoft.module.system.entity.BaseMobileWorkflowConfig;
+import com.xjrsoft.module.system.service.IBaseMobileWorkflowConfigService;
+import com.xjrsoft.module.system.vo.BaseMobileWorkflowConfigListVo;
+
+import com.xjrsoft.module.system.vo.BaseMobileWorkflowConfigVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+* @title: APP 流程单独配置
+* @Author fanxp
+* @Date: 2023-11-06
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/system" + "/basemobileworkflowconfig")
+@Api(value = "/system"  + "/basemobileworkflowconfig",tags = "APP 流程单独配置代码")
+@AllArgsConstructor
+public class BaseMobileWorkflowConfigController {
+
+
+    private final IBaseMobileWorkflowConfigService baseMobileWorkflowConfigService;
+
+    @GetMapping(value = "/list")
+    @ApiOperation(value="APP 流程单独配置列表(不分页)")
+    @SaCheckPermission("basemobileworkflowconfig:detail")
+    public RT<List<BaseMobileWorkflowConfigListVo>> list(@Valid BaseMobileWorkflowConfigListDto dto){
+
+        LambdaQueryWrapper<BaseMobileWorkflowConfig> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(BaseMobileWorkflowConfig::getId)
+                    .select(BaseMobileWorkflowConfig.class,x -> VoToColumnUtil.fieldsToColumns(BaseMobileWorkflowConfigListVo.class).contains(x.getProperty()));
+
+        List<BaseMobileWorkflowConfig> list = baseMobileWorkflowConfigService.list(queryWrapper);
+        List<BaseMobileWorkflowConfigListVo> listVos = BeanUtil.copyToList(list, BaseMobileWorkflowConfigListVo.class);
+        return RT.ok(listVos);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询APP 流程单独配置信息")
+    @SaCheckPermission("basemobileworkflowconfig:detail")
+    public RT<BaseMobileWorkflowConfigVo> info(@RequestParam Long id){
+        BaseMobileWorkflowConfig baseMobileWorkflowConfig = baseMobileWorkflowConfigService.getById(id);
+        if (baseMobileWorkflowConfig == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(baseMobileWorkflowConfig, BaseMobileWorkflowConfigVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增APP 流程单独配置")
+    @SaCheckPermission("basemobileworkflowconfig:add")
+    public RT<Boolean> add(@Valid @RequestBody AddBaseMobileWorkflowConfigDto dto){
+        BaseMobileWorkflowConfig baseMobileWorkflowConfig = BeanUtil.toBean(dto, BaseMobileWorkflowConfig.class);
+        boolean isSuccess = baseMobileWorkflowConfigService.save(baseMobileWorkflowConfig);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改APP 流程单独配置")
+    @SaCheckPermission("basemobileworkflowconfig:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateBaseMobileWorkflowConfigDto dto){
+
+        BaseMobileWorkflowConfig baseMobileWorkflowConfig = BeanUtil.toBean(dto, BaseMobileWorkflowConfig.class);
+        return RT.ok(baseMobileWorkflowConfigService.updateById(baseMobileWorkflowConfig));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除APP 流程单独配置")
+    @SaCheckPermission("basemobileworkflowconfig:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(baseMobileWorkflowConfigService.removeBatchByIds(ids));
+
+    }
+
+}

src/main/java/com/xjrsoft/module/system/dto/AddBaseMobileWorkflowConfigDto.java

@@ -0,0 +1,43 @@
+package com.xjrsoft.module.system.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: APP 流程单独配置
+* @Author fanxp
+* @Date: 2023-11-06
+* @Version 1.0
+*/
+@Data
+public class AddBaseMobileWorkflowConfigDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编号 统一标识，手机端根据标识查询
+    */
+    @ApiModelProperty("编号 统一标识，手机端根据标识查询")
+    private String code;
+    /**
+    * 流程ID
+    */
+    @ApiModelProperty("流程ID")
+    private Long workflowId;
+
+}

src/main/java/com/xjrsoft/module/system/dto/BaseMobileWorkflowConfigListDto.java

@@ -0,0 +1,26 @@
+package com.xjrsoft.module.system.dto;
+
+import com.xjrsoft.common.page.ListInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+* @title: APP 流程单独配置列表查询入参
+* @Author fanxp
+* @Date: 2023-11-06
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseMobileWorkflowConfigListDto extends ListInput {
+
+
+}

src/main/java/com/xjrsoft/module/system/dto/UpdateBaseMobileWorkflowConfigDto.java

@@ -0,0 +1,32 @@
+package com.xjrsoft.module.system.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: APP 流程单独配置
+* @Author fanxp
+* @Date: 2023-11-06
+* @Version 1.0
+*/
+@Data
+public class UpdateBaseMobileWorkflowConfigDto extends AddBaseMobileWorkflowConfigDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/system/entity/BaseMobileWorkflowConfig.java

@@ -0,0 +1,62 @@
+package com.xjrsoft.module.system.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+/**
+* @title: APP 流程单独配置
+* @Author fanxp
+* @Date: 2023-11-06
+* @Version 1.0
+*/
+@Data
+@TableName("base_mobile_workflow_config")
+@ApiModel(value = "APP 流程单独配置对象", description = "APP 流程单独配置")
+public class BaseMobileWorkflowConfig implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编号 统一标识，手机端根据标识查询
+    */
+    @ApiModelProperty("编号 统一标识，手机端根据标识查询")
+    private String code;
+    /**
+    * 流程ID
+    */
+    @ApiModelProperty("流程ID")
+    private Long workflowId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+
+
+}

src/main/java/com/xjrsoft/module/system/mapper/BaseMobileWorkflowConfigMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.system.entity.BaseMobileWorkflowConfig;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: APP 流程单独配置
+* @Author fanxp
+* @Date: 2023-11-06
+* @Version 1.0
+*/
+@Mapper
+public interface BaseMobileWorkflowConfigMapper extends BaseMapper<BaseMobileWorkflowConfig> {
+
+}

src/main/java/com/xjrsoft/module/system/service/IBaseMobileWorkflowConfigService.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.system.entity.BaseMobileWorkflowConfig;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: APP 流程单独配置
+* @Author fanxp
+* @Date: 2023-11-06
+* @Version 1.0
+*/
+
+public interface IBaseMobileWorkflowConfigService extends IService<BaseMobileWorkflowConfig> {
+}

src/main/java/com/xjrsoft/module/system/service/impl/BaseMobileWorkflowConfigServiceImpl.java

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.system.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.system.entity.BaseMobileWorkflowConfig;
+import com.xjrsoft.module.system.mapper.BaseMobileWorkflowConfigMapper;
+import com.xjrsoft.module.system.service.IBaseMobileWorkflowConfigService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+/**
+* @title: APP 流程单独配置
+* @Author fanxp
+* @Date: 2023-11-06
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class BaseMobileWorkflowConfigServiceImpl extends ServiceImpl<BaseMobileWorkflowConfigMapper, BaseMobileWorkflowConfig> implements IBaseMobileWorkflowConfigService {
+}

src/main/java/com/xjrsoft/module/system/vo/BaseMobileWorkflowConfigListVo.java

@@ -0,0 +1,49 @@
+package com.xjrsoft.module.system.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+* @title: APP 流程单独配置列表列表入参
+* @Author fanxp
+* @Date: 2023-11-06
+* @Version 1.0
+*/
+@Data
+public class BaseMobileWorkflowConfigListVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编号 统一标识，手机端根据标识查询
+    */
+    @ApiModelProperty("编号 统一标识，手机端根据标识查询")
+    private String code;
+    /**
+    * 流程ID
+    */
+    @ApiModelProperty("流程ID")
+    private Long workflowId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+
+}

src/main/java/com/xjrsoft/module/system/vo/BaseMobileWorkflowConfigVo.java

@@ -0,0 +1,44 @@
+package com.xjrsoft.module.system.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+/**
+* @title: APP 流程单独配置表单出参
+* @Author fanxp
+* @Date: 2023-11-06
+* @Version 1.0
+*/
+@Data
+public class BaseMobileWorkflowConfigVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编号 统一标识，手机端根据标识查询
+    */
+    @ApiModelProperty("编号 统一标识，手机端根据标识查询")
+    private String code;
+    /**
+    * 流程ID
+    */
+    @ApiModelProperty("流程ID")
+    private Long workflowId;
+
+
+
+}

src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -41,7 +41,7 @@ import java.util.stream.Collectors;
 
 public class FreeMarkerGeneratorTest {
 
-    private static final DataSource ds = new SimpleDataSource("jdbc:mysql://8.142.26.206:3306/tl?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true",
+    private static final DataSource ds = new SimpleDataSource("jdbc:mysql://10.150.10.139:3306/tl?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true",
             "root" , "Zwr~-f6H,u6QE^]C-AD_" );
 
     @Test
@@ -345,7 +345,7 @@ public class FreeMarkerGeneratorTest {
         params.setPage(false);
         params.setImport(false);
         params.setExport(false);
-        params.setOutMainDir(false);
+        params.setOutMainDir(true);
         params.setDs(ds);