评估合同登记和归档撤回

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/workContract/controller/WorkContractFileController.java

@@ -64,4 +64,13 @@ public class WorkContractFileController {
     public WorkContractFile findByContractInfoId(@RequestParam String id) {
         return workContractFileService.findByContractInfoId(id);
     }
+
+    /**
+     * 根据id修改状态status
+     */
+    @ApiOperation(value = "根据id删除归档数据")
+    @PostMapping(value = "deleteById")
+    public int  deleteById(@RequestBody WorkContractFileDto workContractFileDto) {
+        return workContractFileService.deleteById(workContractFileDto);
+    }
 }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/workContract/mapper/WorkContractFileMapper.java

@@ -12,4 +12,6 @@ public interface WorkContractFileMapper extends BaseMapper<WorkContractFile> {
     void updateStatusById(@Param("id") String id, @Param("filedType")String filedType);
     @InterceptorIgnore(tenantLine = "true")
     WorkContractFile selectFileByContractInfoId (@Param("id") String id);
+
+    Integer removeById(@Param("id") String id);
 }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/workContract/mapper/xml/WorkContractFileMapper.xml

@@ -10,4 +10,10 @@
 	<select id="selectFileByContractInfoId" resultType="com.jeeplus.assess.workContract.domain.WorkContractFile">
 		SELECT * FROM `work_contract_file` WHERE del_flag = 0 AND contract_info_id = #{id}
 	</select>
+
+	<delete id="removeById">
+		DELETE FROM work_contract_file
+		WHERE del_flag = 0 AND contract_info_id = #{id}
+	</delete>
+
 </mapper>

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/workContract/service/WorkContractFileService.java

@@ -15,6 +15,7 @@ import com.jeeplus.sys.service.dto.UserDTO;
 //import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
 //import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
 //import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
+import io.swagger.models.auth.In;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -84,6 +85,16 @@ public class WorkContractFileService {
         workContractFileMapper.updateStatusById(workContractFileDto.getId(), workContractFileDto.getFiledType());
     }
 
+
+    /**
+     * 根据id删除归档
+     */
+    public int deleteById(WorkContractFileDto workContractFileDto) {
+       return workContractFileMapper.removeById(workContractFileDto.getId());
+    }
+
+
+
     public WorkContractFile findById(String id) {
         return workContractFileMapper.selectById(id);
     }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/controller/ContractFilePaperController.java

@@ -48,4 +48,6 @@ public class ContractFilePaperController {
     public ContractFilePaper findByContractInfoId(@RequestParam String id) {
         return service.findByContractInfoId(id);
     }
+
+
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/mapper/xml/ContractFilePaperMapper.xml

@@ -33,4 +33,8 @@
         WHERE del_flag = 0 AND contract_info_id = #{id}
     </update>
 
+    <update id="updateFileNumber">
+        UPDATE cw_work_contract_file_paper SET filed_no = #{filedNo}
+        WHERE del_flag = 0 AND contract_info_id = #{id}
+    </update>
 </mapper>

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/controller/FlowableProcessController.java

@@ -215,7 +215,6 @@ public class FlowableProcessController {
         } catch (FlowableObjectNotFoundException e) {
             return ResponseEntity.ok ( "操作失败，流程已经结束!" );
         }
-
     }