Merge branch 'master' of http://116.204.116.5:3000/zzw/cbjs-mvue-master

assistMg/src/main/java/com/hotent/enterpriseDeclare/controller/CostProjectTaskMaterialDataController.java

@@ -0,0 +1,54 @@
+package com.hotent.enterpriseDeclare.controller;
+
+
+import com.hotent.enterpriseDeclare.manager.CostProjectTaskMaterialDataManager;
+import com.hotent.enterpriseDeclare.model.CostProjectTaskMaterialData;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.hotent.base.model.CommonResult;
+import com.hotent.base.util.StringUtil;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.RestController;
+import com.hotent.base.controller.BaseController;
+
+/**
+ * 项目流程资料数据表 前端控制器
+ *
+ * @author 超级管理员
+ * @since 2025-10-28
+ */
+@RestController
+@RequestMapping("/costProjectTaskMaterialData/v1/")
+public class CostProjectTaskMaterialDataController extends BaseController<CostProjectTaskMaterialDataManager, CostProjectTaskMaterialData> {
+
+	/**
+	 * 根据id获取项目流程资料数据表数据详情
+	 * @param id
+	 * @return
+	 * @throws Exception
+	 * ModelAndView
+	 */
+	@GetMapping(value="/getDetail")
+	@ApiOperation(value="根据id获取项目流程资料数据表数据详情",httpMethod = "GET",notes = "根据id获取项目流程资料数据表数据详情")
+	public CommonResult<CostProjectTaskMaterialData> getDetail(@ApiParam(name="id",value="业务对象主键", required = true)@RequestParam(required=true) String id) throws Exception{
+		return CommonResult.<CostProjectTaskMaterialData>ok().value(baseService.getDetail(id));
+	}
+    /**
+	 * 新增,更新项目流程资料数据表
+	 * @param costProjectTaskMaterialData
+	 * @throws Exception
+	 * @return
+	 * @exception
+	 */
+	@PostMapping(value="/save")
+	@ApiOperation(value = "新增,更新项目流程资料数据表数据", httpMethod = "POST", notes = "新增,更新项目流程资料数据表数据")
+	public CommonResult<String> save(@ApiParam(name="CostProjectTaskMaterialData",value="项目流程资料数据表对象", required = true)@RequestBody CostProjectTaskMaterialData costProjectTaskMaterialData) throws Exception{
+		String msg = StringUtil.isEmpty(costProjectTaskMaterialData.getId()) ? "添加项目流程资料数据表成功" : "更新项目流程资料数据表成功";
+		baseService.createOrUpdate(costProjectTaskMaterialData);
+		return CommonResult.<String>ok().message(msg);
+	}
+}

assistMg/src/main/java/com/hotent/enterpriseDeclare/dao/CostProjectTaskMaterialDataDao.java

@@ -0,0 +1,14 @@
+package com.hotent.enterpriseDeclare.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hotent.enterpriseDeclare.model.CostProjectTaskMaterialData;
+
+/**
+ * 项目流程资料数据表 Mapper 接口
+ *
+ * @author 超级管理员
+ * @since 2025-10-28
+ */
+public interface CostProjectTaskMaterialDataDao extends BaseMapper<CostProjectTaskMaterialData> {
+
+}

assistMg/src/main/java/com/hotent/enterpriseDeclare/manager/CostProjectTaskMaterialDataManager.java

@@ -0,0 +1,25 @@
+package com.hotent.enterpriseDeclare.manager;
+
+import com.hotent.base.manager.BaseManager;
+import com.hotent.enterpriseDeclare.model.CostProjectTaskMaterialData;
+
+/**
+ * 项目流程资料数据表 服务类
+ *
+ * @author 超级管理员
+ * @since 2025-10-28
+ */
+public interface CostProjectTaskMaterialDataManager extends BaseManager<CostProjectTaskMaterialData> {
+	/**
+	 * 根据主键获取详情
+	 * @param id
+	 * @return
+	 */
+	CostProjectTaskMaterialData getDetail(String id);
+	/**
+	 * 新建、更新项目流程资料数据表
+	 * @param costProjectTaskMaterialData
+	 * @return
+	 */
+	void createOrUpdate(CostProjectTaskMaterialData costProjectTaskMaterialData);
+}

assistMg/src/main/java/com/hotent/enterpriseDeclare/manager/impl/CostProjectTaskMaterialDataManagerImpl.java

@@ -0,0 +1,33 @@
+package com.hotent.enterpriseDeclare.manager.impl;
+
+import com.hotent.base.manager.impl.BaseManagerImpl;
+import com.hotent.enterpriseDeclare.dao.CostProjectTaskMaterialDataDao;
+import com.hotent.enterpriseDeclare.manager.CostProjectTaskMaterialDataManager;
+import com.hotent.enterpriseDeclare.model.CostProjectTaskMaterialData;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+
+/**
+ * 项目流程资料数据表 服务实现类
+ *
+ * @author 超级管理员
+ * @since 2025-10-28
+ */
+@Service
+public class CostProjectTaskMaterialDataManagerImpl extends BaseManagerImpl<CostProjectTaskMaterialDataDao, CostProjectTaskMaterialData> implements CostProjectTaskMaterialDataManager {
+
+	@Override
+	public CostProjectTaskMaterialData getDetail(String id) {
+    	CostProjectTaskMaterialData costProjectTaskMaterialData = this.get(id);
+
+
+		return costProjectTaskMaterialData;
+	}
+	@Override
+	@Transactional
+	public void createOrUpdate(CostProjectTaskMaterialData costProjectTaskMaterialData) {
+		//新建或更新
+		this.saveOrUpdate(costProjectTaskMaterialData);
+	}
+}

assistMg/src/main/java/com/hotent/enterpriseDeclare/model/CostProjectTaskMaterialData.java

@@ -0,0 +1,244 @@
+package com.hotent.enterpriseDeclare.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.hotent.base.entity.BaseModel;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
+/**
+ * 项目流程资料数据表
+ *
+ * @author 超级管理员
+ * @since 2025-10-28
+ */
+@ApiModel(value="CostProjectTaskMaterialData对象", description="项目流程资料数据表")
+public class CostProjectTaskMaterialData extends BaseModel<CostProjectTaskMaterialData> {
+
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value = "主键ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    @JsonProperty("id")
+    private Long id;
+
+    @ApiModelProperty(value = "企业ID")
+    @TableField("audited_unit_id")
+    @JsonProperty("auditedUnitId")
+    private Long auditedUnitId;
+
+    @ApiModelProperty(value = "用户ID")
+    @TableField("user_id")
+    @JsonProperty("userId")
+    private Long userId;
+
+    @ApiModelProperty(value = "对应的资料规则ID")
+    @TableField("task_material_id")
+    @JsonProperty("taskMaterialId")
+    private Long taskMaterialId;
+
+    @ApiModelProperty(value = "任务ID")
+    @TableField("task_id")
+    @JsonProperty("taskId")
+    private Long taskId;
+
+    @ApiModelProperty(value = "模板ID")
+    @TableField("template_id")
+    @JsonProperty("templateId")
+    private Long templateId;
+
+    @ApiModelProperty(value = "资料类型")
+    @TableField("material_type")
+    @JsonProperty("materialType")
+    private String materialType;
+
+    @ApiModelProperty(value = "附件地址")
+    @TableField("attachment_url")
+    @JsonProperty("attachmentUrl")
+    private String attachmentUrl;
+
+    @ApiModelProperty(value = "附件后缀")
+    @TableField("attachment_suffix")
+    @JsonProperty("attachmentSuffix")
+    private String attachmentSuffix;
+
+    @ApiModelProperty(value = "审核状态")
+    @TableField("audit_status")
+    @JsonProperty("auditStatus")
+    private String auditStatus;
+
+    @ApiModelProperty(value = "上传时间")
+    @TableField("upload_time")
+    @JsonProperty("uploadTime")
+    private LocalDateTime uploadTime;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
+    @JsonProperty("createTime")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField("create_by_")
+    @JsonProperty("createBy")
+    private String createBy;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField("update_time")
+    @JsonProperty("updateTime")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "更新人")
+    @TableField("update_by_")
+    @JsonProperty("updateBy")
+    private String updateBy;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    @JsonProperty("remark")
+    private String remark;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public Long getAuditedUnitId() {
+        return auditedUnitId;
+    }
+
+    public void setAuditedUnitId(Long auditedUnitId) {
+        this.auditedUnitId = auditedUnitId;
+    }
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+    public Long getTaskMaterialId() {
+        return taskMaterialId;
+    }
+
+    public void setTaskMaterialId(Long taskMaterialId) {
+        this.taskMaterialId = taskMaterialId;
+    }
+    public Long getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(Long taskId) {
+        this.taskId = taskId;
+    }
+    public Long getTemplateId() {
+        return templateId;
+    }
+
+    public void setTemplateId(Long templateId) {
+        this.templateId = templateId;
+    }
+    public String getMaterialType() {
+        return materialType;
+    }
+
+    public void setMaterialType(String materialType) {
+        this.materialType = materialType;
+    }
+    public String getAttachmentUrl() {
+        return attachmentUrl;
+    }
+
+    public void setAttachmentUrl(String attachmentUrl) {
+        this.attachmentUrl = attachmentUrl;
+    }
+    public String getAttachmentSuffix() {
+        return attachmentSuffix;
+    }
+
+    public void setAttachmentSuffix(String attachmentSuffix) {
+        this.attachmentSuffix = attachmentSuffix;
+    }
+    public String getAuditStatus() {
+        return auditStatus;
+    }
+
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
+    public LocalDateTime getUploadTime() {
+        return uploadTime;
+    }
+
+    public void setUploadTime(LocalDateTime uploadTime) {
+        this.uploadTime = uploadTime;
+    }
+    public LocalDateTime getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(LocalDateTime createTime) {
+        this.createTime = createTime;
+    }
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+    public LocalDateTime getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(LocalDateTime updateTime) {
+        this.updateTime = updateTime;
+    }
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "CostProjectTaskMaterialData{" +
+            "id=" + id +
+            ", auditedUnitId=" + auditedUnitId +
+            ", userId=" + userId +
+            ", taskMaterialId=" + taskMaterialId +
+            ", taskId=" + taskId +
+            ", templateId=" + templateId +
+            ", materialType=" + materialType +
+            ", attachmentUrl=" + attachmentUrl +
+            ", attachmentSuffix=" + attachmentSuffix +
+            ", auditStatus=" + auditStatus +
+            ", uploadTime=" + uploadTime +
+            ", createTime=" + createTime +
+            ", createBy=" + createBy +
+            ", updateTime=" + updateTime +
+            ", updateBy=" + updateBy +
+            ", remark=" + remark +
+        "}";
+    }
+}

assistMg/src/main/java/com/hotent/project/controller/CostProjectTaskMaterialController.java

@@ -6,6 +6,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import java.util.List;
 import com.hotent.base.model.CommonResult;
 import com.hotent.base.util.StringUtil;
 import io.swagger.annotations.ApiOperation;
@@ -27,16 +28,15 @@ import com.hotent.project.manager.CostProjectTaskMaterialManager;
 public class CostProjectTaskMaterialController extends BaseController<CostProjectTaskMaterialManager, CostProjectTaskMaterial> {
 
 	/**
-	 * 根据id获取任务定制-报送资料要求数据详情
-	 * @param id
+	 * 根据taskId获取任务定制-报送资料要求数据列表
+	 * @param taskId 任务ID
 	 * @return
 	 * @throws Exception 
-	 * ModelAndView
 	 */
-	@GetMapping(value="/getDetail")
-	@ApiOperation(value="根据id获取任务定制-报送资料要求数据详情",httpMethod = "GET",notes = "根据id获取任务定制-报送资料要求数据详情")
-	public CommonResult<CostProjectTaskMaterial> getDetail(@ApiParam(name="id",value="业务对象主键", required = true)@RequestParam(required=true) String id) throws Exception{
-		return CommonResult.<CostProjectTaskMaterial>ok().value(baseService.getDetail(id));
+	@GetMapping(value="/listByTaskId")
+	@ApiOperation(value="根据taskId获取任务定制-报送资料要求数据列表",httpMethod = "GET",notes = "根据taskId获取任务定制-报送资料要求数据列表")
+	public CommonResult<List<CostProjectTaskMaterial>> listByTaskId(@ApiParam(name="taskId",value="任务ID", required = true)@RequestParam(required=true) String taskId) throws Exception{
+		return CommonResult.<List<CostProjectTaskMaterial>>ok().value(baseService.listByTaskId(taskId));
 	}
     /**
 	 * 新增,更新任务定制-报送资料要求

assistMg/src/main/java/com/hotent/project/manager/CostProjectTaskMaterialManager.java

@@ -1,7 +1,10 @@
 package com.hotent.project.manager;
 
+import java.util.List;
 import com.hotent.project.model.CostProjectTaskMaterial;
 import com.hotent.base.manager.BaseManager;
+import com.hotent.base.query.QueryFilter;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
  * 任务定制-报送资料要求 服务类
@@ -17,10 +20,31 @@ public interface CostProjectTaskMaterialManager extends BaseManager<CostProjectT
 	 * @return
 	 */
 	CostProjectTaskMaterial getDetail(String id);
+	
 	/**
 	 * 新建、更新任务定制-报送资料要求
 	 * @param costProjectTaskMaterial
 	 * @return
 	 */
 	void createOrUpdate(CostProjectTaskMaterial costProjectTaskMaterial);
+	
+	/**
+	 * 删除任务定制-报送资料要求
+	 * @param id
+	 */
+	void deleteById(String id);
+	
+	/**
+	 * 批量删除任务定制-报送资料要求
+	 * @param ids
+	 */
+	void batchDelete(String[] ids);
+	
+	
+	/**
+	 * 根据任务ID获取任务定制-报送资料要求列表
+	 * @param taskId
+	 * @return
+	 */
+	List<CostProjectTaskMaterial> listByTaskId(String taskId);
 }

assistMg/src/main/java/com/hotent/project/manager/impl/CostProjectTaskMaterialManagerImpl.java

@@ -1,15 +1,18 @@
 package com.hotent.project.manager.impl;
 
-import com.hotent.project.model.CostProjectTaskMaterial;
-import com.hotent.project.dao.CostProjectTaskMaterialDao;
-import com.hotent.project.manager.CostProjectTaskMaterialManager;
-import com.hotent.base.manager.impl.BaseManagerImpl;
+import java.util.Arrays;
+import java.util.List;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import java.util.List;
-import javax.annotation.Resource;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.hotent.base.manager.impl.BaseManagerImpl;
+import com.hotent.base.query.QueryFilter;
 import com.hotent.base.util.BeanUtils;
+import com.hotent.project.dao.CostProjectTaskMaterialDao;
+import com.hotent.project.manager.CostProjectTaskMaterialManager;
+import com.hotent.project.model.CostProjectTaskMaterial;
+import javax.annotation.Resource;
 
 
 /**
@@ -25,14 +28,37 @@ public class CostProjectTaskMaterialManagerImpl extends BaseManagerImpl<CostProj
 	@Override
 	public CostProjectTaskMaterial getDetail(String id) {
     	CostProjectTaskMaterial costProjectTaskMaterial = this.get(id);
-    	
-
+    	if (BeanUtils.isEmpty(costProjectTaskMaterial)) {
+    		throw new RuntimeException("任务定制-报送资料要求不存在");
+    	}
 		return costProjectTaskMaterial;
 	}
+	
 	@Override
 	@Transactional
 	public void createOrUpdate(CostProjectTaskMaterial costProjectTaskMaterial) {
 		//新建或更新
 		this.saveOrUpdate(costProjectTaskMaterial);
 	}
+	
+	@Override
+	@Transactional
+	public void deleteById(String id) {
+		this.removeById(id);
+	}
+	
+	@Override
+	@Transactional
+	public void batchDelete(String[] ids) {
+		this.removeByIds(Arrays.asList(ids));
+	}
+	
+	@Override
+	public List<CostProjectTaskMaterial> listByTaskId(String taskId) {
+		QueryWrapper<CostProjectTaskMaterial> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("task_id", taskId);
+		queryWrapper.orderByAsc("order_num");
+		return this.list(queryWrapper);
+	}
+
 }

assistMg/src/main/java/com/hotent/project/model/CostProjectTaskMaterial.java

@@ -106,6 +106,10 @@ public class CostProjectTaskMaterial extends BaseModel<CostProjectTaskMaterial>
     @JsonProperty("updateTime")
     private LocalDateTime updateTime;
     
+    @ApiModelProperty(value = "是否上传 0:未上传，1:已上传")
+    @JsonProperty("isUploaded")
+    private boolean isUploaded;
+    
 
     public String getId() {
         return id;
@@ -226,7 +230,14 @@ public class CostProjectTaskMaterial extends BaseModel<CostProjectTaskMaterial>
     public void setUpdateTime(LocalDateTime updateTime) {
         this.updateTime = updateTime;
     }
-
+    
+    public boolean getIsUploaded() {
+        return isUploaded;
+    }
+    
+    public void setIsUploaded(boolean isUploaded) {
+        this.isUploaded = isUploaded;
+    }
 
     @Override
     protected Serializable pkVal() {
@@ -253,6 +264,7 @@ public class CostProjectTaskMaterial extends BaseModel<CostProjectTaskMaterial>
             ", updateBy=" + updateBy +
             ", formatRequired=" + formatRequired +
             ", updateTime=" + updateTime +
+            ", isUploaded=" + isUploaded +  
         "}";
     }
-}
+}

assistMg/src/main/resources/mapper/CostProjectTaskMaterialDataMapper.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hotent.enterpriseDeclare.dao.CostProjectTaskMaterialDataDao">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hotent.enterpriseDeclare.model.CostProjectTaskMaterialData">
+        <id column="id" property="id" />
+    <result column="audited_unit_id" property="auditedUnitId" />
+    <result column="user_id" property="userId" />
+    <result column="task_material_id" property="taskMaterialId" />
+    <result column="task_id" property="taskId" />
+    <result column="template_id" property="templateId" />
+    <result column="material_type" property="materialType" />
+    <result column="attachment_url" property="attachmentUrl" />
+    <result column="attachment_suffix" property="attachmentSuffix" />
+    <result column="audit_status" property="auditStatus" />
+    <result column="upload_time" property="uploadTime" />
+    <result column="create_time" property="createTime" />
+    <result column="create_by_" property="createBy" />
+    <result column="update_time" property="updateTime" />
+    <result column="update_by_" property="updateBy" />
+    <result column="remark" property="remark" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, audited_unit_id, user_id, task_material_id, task_id, template_id, material_type, attachment_url, attachment_suffix, audit_status, upload_time, create_time, create_by_, update_time, update_by_, remark
+    </sql>
+
+	<select id="selectPage" resultMap="BaseResultMap">
+		select
+			<include refid="Base_Column_List"/>
+		from
+			cost_project_task_material_data
+		${ew.customSqlSegment}
+	</select>
+
+	<select id="selectList" resultMap="BaseResultMap">
+		select
+			<include refid="Base_Column_List"/>
+		from
+			cost_project_task_material_data
+		${ew.customSqlSegment}
+	</select>
+
+	<select id="selectById" resultMap="BaseResultMap">
+		select
+			<include refid="Base_Column_List"/>
+		from
+			cost_project_task_material_data
+		where
+		    id = ${id}
+	</select>
+</mapper>