Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

zjugis-business/src/main/java/com/zjugis/business/flow/contract/event/ContractEvent.java

@@ -193,7 +193,7 @@ public class ContractEvent extends BaseController {
             if (!Objects.isNull(flowInstance) && flowInstance.containsKey("id")) {
                 String flowInstanceId = flowInstance.get("id").toString();
                 Contract entity = contractService.selectByInstanceId(flowInstanceId);
-                contractService.deleteByIdList(Collections.singletonList(entity.getId()));
+                contractService.deleteById(entity.getId(),false);
                 return ok("true");
             } else {
                 throw new BusinessException("执行事件出错，请联系管理员！");

zjugis-business/src/main/java/com/zjugis/business/flow/contractF/controller/vo/ContractFPageVO.java

@@ -4,10 +4,13 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.zjugis.framework.common.pojo.PageParam;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
+import static com.zjugis.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
 /**
  * @author jzh
  * @since 2024/2/21 9:51
@@ -28,4 +31,11 @@ public class ContractFPageVO extends PageParam {
      * 类型(1变更  2解除 3撤销 4终止 5纠纷)
      */
     private Integer type;
+
+    /**
+     * 合同时间
+     */
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] contractTime;
+
 }

zjugis-business/src/main/java/com/zjugis/business/flow/contractF/controller/vo/ContractFVO.java

@@ -75,4 +75,6 @@ public class ContractFVO {
      * 类型(1变更  2解除 3撤销 4终止 5纠纷)
      */
     private Integer type;
+
+    private LocalDateTime createTime;
 }

zjugis-business/src/main/java/com/zjugis/business/flow/contractF/dao/ContractFDAO.java

@@ -24,6 +24,7 @@ public interface ContractFDAO extends BaseMapperX<ContractFDO> {
                 .eqIfPresent(ContractFDO::getContractNumber, dto.getContractNumber())
                 .eqIfPresent(ContractFDO::getFlowStatus, "90")
                 .eqIfPresent(ContractFDO::getType, dto.getType())
+                .betweenIfPresent(ContractFDO::getCreateTime, dto.getContractTime())
                 .orderByDesc(ContractFDO::getLatestModifyTime)
         );
     }

zjugis-business/src/main/java/com/zjugis/business/mapper/ContractMapper.java

@@ -38,4 +38,6 @@ public interface ContractMapper extends BaseMapperX<Contract> {
     ContractMessageCountResp messageCountContract(@Param("params") ContractMessageDto messageDto);
 
     BigDecimal messageCountReturn(@Param("params") ContractMessageDto messageDto);
+
+    int deleteAbsoluteById(String id);
 }

zjugis-business/src/main/java/com/zjugis/business/service/ContractService.java

@@ -36,6 +36,8 @@ public interface ContractService{
 
     int deleteByIdList(List<String> id);
 
+    int deleteById(String id,boolean logic);
+
     List<ContractResponse> selectWithChildren(String projectId);
 
     Contract selectByInstanceId(String id);

zjugis-business/src/main/java/com/zjugis/business/service/impl/ContractServiceImpl.java

@@ -278,6 +278,19 @@ public class ContractServiceImpl implements ContractService{
         return contractMapper.deleteBatchIds(idList);
     }
 
+    /**
+     * @param logic
+     * @return
+     */
+    @Override
+    public int deleteById(String id,boolean logic) {
+        if(logic) {
+            return contractMapper.deleteById(id);
+        } else {
+            return contractMapper.deleteAbsoluteById(id);
+        }
+    }
+
     public List<ContractResponse> selectWithChildren(String projectId) {
         List<Contract> contracts = contractMapper.selectWithChildren(projectId);
         if(contracts.isEmpty()){

zjugis-business/src/main/resources/mapper/oracle/ContractMapper.xml

@@ -281,4 +281,8 @@
             </if>
         </where>
     </select>
+
+    <delete id="deleteAbsoluteById">
+        delete from CONTRACT where ID = #{id,jdbcType=VARCHAR}
+    </delete>
 </mapper>

zjugis-business/src/main/resources/templates/FlowContractSub/outsourcingApply.ftl

@@ -130,98 +130,97 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css' ]>
                     </table>
                 </div>
 
-                    <div class="form-title">
-                        <div class="form-icon">
-                            <img src="/imgs/titleIcon.png" alt="">
-                            <span>项目信息</span>
-                        </div>
-                        <div class="form-btn">
-                        </div>
+                <div class="form-title">
+                    <div class="form-icon">
+                        <img src="/imgs/titleIcon.png" alt="">
+                        <span>项目信息</span>
                     </div>
-                    <div class="qjsjxx-box">
-                        <div class="jbxx-box jbxx-box-flex">
-                            <table class="jbxx-table-info">
-                                <tr>
-                                    <td class="th">
-                                        <div class="form-label">项目名称：</div>
-                                    </td>
-                                    <td>
-                                        <div class="form-group">
-                                            <div class="form-item">
-                                                <div class="z-comp-input z-readonly">
-                                                    <input type="text" value="${(project.xmmc)!}">
-                                                </div>
+                    <div class="form-btn">
+                    </div>
+                </div>
+                <div class="qjsjxx-box">
+                    <div class="jbxx-box jbxx-box-flex">
+                        <table class="jbxx-table-info">
+                            <tr>
+                                <td class="th">
+                                    <div class="form-label">项目名称：</div>
+                                </td>
+                                <td>
+                                    <div class="form-group">
+                                        <div class="form-item">
+                                            <div class="z-comp-input z-readonly">
+                                                <input type="text" value="${(project.xmmc)!}">
                                             </div>
                                         </div>
-                                    </td>
-                                    <td class="th">
-                                        <div class="form-label">项目编号：</div>
-                                    </td>
-                                    <td>
-                                        <div class="form-group">
-                                            <div class="form-item" >
-                                                <div class="z-comp-input z-readonly">
-                                                    <input type="text" value="${(project.xmbh)!}">
-                                                </div>
+                                    </div>
+                                </td>
+                                <td class="th">
+                                    <div class="form-label">项目编号：</div>
+                                </td>
+                                <td>
+                                    <div class="form-group">
+                                        <div class="form-item" >
+                                            <div class="z-comp-input z-readonly">
+                                                <input type="text" value="${(project.xmbh)!}">
                                             </div>
                                         </div>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td class="th">
-                                        <div class="form-label">主合同名称：</div>
-                                    </td>
-                                    <td>
-                                        <div class="form-group">
-                                            <div class="form-item" >
-                                                <div class="z-comp-input z-readonly">
-                                                    <input type="text" value="${(mainContract.name)!}">
-                                                </div>
+                                    </div>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="th">
+                                    <div class="form-label">主合同名称：</div>
+                                </td>
+                                <td>
+                                    <div class="form-group">
+                                        <div class="form-item" >
+                                            <div class="z-comp-input z-readonly">
+                                                <input type="text" value="${(mainContract.name)!}">
                                             </div>
                                         </div>
-                                    </td>
-                                    <td class="th">
-                                        <div class="form-label">主合同编号：</div>
-                                    </td>
-                                    <td>
-                                        <div class="form-group">
-                                            <div class="form-item" >
-                                                <div class="z-comp-input z-readonly">
-                                                    <input type="text" value="${(mainContract.contractNumber)!}">
-                                                </div>
+                                    </div>
+                                </td>
+                                <td class="th">
+                                    <div class="form-label">主合同编号：</div>
+                                </td>
+                                <td>
+                                    <div class="form-group">
+                                        <div class="form-item" >
+                                            <div class="z-comp-input z-readonly">
+                                                <input type="text" value="${(mainContract.contractNumber)!}">
                                             </div>
                                         </div>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td class="th">
-                                        <div class="form-label">主合同金额：</div>
-                                    </td>
-                                    <td>
-                                        <div class="form-group">
-                                            <div class="form-item" >
-                                                <div class="z-comp-input z-readonly">
-                                                    <input type="text" value="${(mainContract.contractAmount)!}">
-                                                </div>
+                                    </div>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="th">
+                                    <div class="form-label">主合同金额：</div>
+                                </td>
+                                <td>
+                                    <div class="form-group">
+                                        <div class="form-item" >
+                                            <div class="z-comp-input z-readonly">
+                                                <input type="text" value="${(mainContract.contractAmount)!}">
                                             </div>
                                         </div>
-                                    </td>
-                                    <td class="th">
-                                        <div class="form-label">责任部门：</div>
-                                    </td>
-                                    <td>
-                                        <div class="form-group">
-                                            <div class="form-item" >
-                                                <div class="z-comp-input z-readonly">
-                                                    <input type="text" value="${(project.zrbm)!}">
-                                                </div>
+                                    </div>
+                                </td>
+                                <td class="th">
+                                    <div class="form-label">责任部门：</div>
+                                </td>
+                                <td>
+                                    <div class="form-group">
+                                        <div class="form-item" >
+                                            <div class="z-comp-input z-readonly">
+                                                <input type="text" value="${(project.zrbm)!}">
                                             </div>
                                         </div>
-                                    </td>
-                                </tr>
+                                    </div>
+                                </td>
+                            </tr>
 
-                            </table>
-                        </div>
+                        </table>
                     </div>
                 </div>
                 <div class="form-title">
@@ -264,71 +263,11 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css' ]>
                                         </div>
                                     </div>
                                 </td>
-<#--                                <td class="th">-->
-<#--                                    <div class="form-label">委托方编号：</div>-->
-<#--                                </td>-->
-<#--                                <td>-->
-<#--                                    <div class="form-group">-->
-<#--                                        <div class="form-item">-->
-<#--                                            <div class="z-comp-input" name="contractSub$clientNumber">-->
-<#--                                                <input type="text" value="${formEntity.clientNumber!}">-->
-<#--                                            </div>-->
-<#--                                        </div>-->
-<#--                                    </div>-->
-<#--                                </td>-->
                             </tr>
-<#--                            <tr>-->
-
-<#--                                <td class="th">-->
-<#--                                    <div class="form-label">区域经理：</div>-->
-<#--                                </td>-->
-<#--                                <td>-->
-<#--                                    <div class="form-group">-->
-<#--                                        <div class="z-comp-selecttree" name="areaManager">-->
-<#--                                            <input type="hidden" name="contractSub$areaManagerId" value="${formEntity.areaManagerId!}">-->
-<#--                                            <input type="hidden" name="contractSub$areaManager" value="${formEntity.areaManager!}">-->
-<#--                                            <div class="z-inputselect-bar">-->
-<#--                                                <span></span><i></i>-->
-<#--                                            </div>-->
-<#--                                        </div>-->
-<#--                                    </div>-->
-<#--                                </td>-->
-                                <#-- <td>--> <#-- <div class="form-label">合同金额：
-          </div>--> <#-- </td>--> <#-- <td>--> <#-- <div class="form-group">--> <#-- <div class="form-item">--> <#-- <div class="z-comp-input" name="contractSub$contractAmount">--> <#-- <input type="text" value="${formEntity.contractAmount!}">--> <#-- </div>--> <#-- </div>--> <#-- </div>--> <#-- </td>-->
-<#--                            </tr>-->
                         </table>
                     </div>
                 </div>
-<#--                <div class="form-title">-->
-<#--                    <div class="form-icon">-->
-<#--                        <img src="/imgs/titleIcon.png" alt="">-->
-<#--                        <span>到期提醒</span>-->
-<#--                    </div>-->
-<#--                    <div class="form-btn">-->
-<#--                    </div>-->
-<#--                </div>-->
-<#--                <div class="qjsjxx-box">-->
-<#--                    <div class="jbxx-box jbxx-box-flex">-->
-<#--                        <table class="jbxx-table-info">-->
-<#--                            <tr>-->
-<#--                                <td class="th">-->
-<#--                                    <div class="form-label">是否到期提醒：</div>-->
-<#--                                </td>-->
-<#--                                <td>-->
-<#--                                    <div class="form-group">-->
-<#--                                        <div class="form-item" >-->
-<#--                                            <div class="z-comp-radio" name="contractSub$isRemindExpiry">-->
-<#--                                                <div class="z-radio-item <#if (formEntity.isRemindExpiry!-1) == 1>checked</#if>" value="1"><i></i>是</div>-->
-<#--                                                <div class="z-radio-item <#if (formEntity.isRemindExpiry!-1) == 0>checked</#if>" value="0"><i></i>否</div>-->
-<#--                                            </div>-->
-<#--                                        </div>-->
-<#--                                    </div>-->
-<#--                                </td>-->
-<#--                               -->
-<#--                            </tr>-->
-<#--                        </table>-->
-<#--                    </div>-->
-<#--                </div>-->
+            </div>
             <div class="ow-tab-content" name="yj">
                 <#if WORKFLOW.OPINION! !="">
                     <div class="form-title">

zjugis-business/src/main/resources/templates/FlowContractSub/subcontractApply.ftl

@@ -143,99 +143,97 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css' ]>
                         </tr>
                     </table>
                 </div>
-
-                    <div class="form-title">
-                        <div class="form-icon">
-                            <img src="/imgs/titleIcon.png" alt="">
-                            <span>项目信息</span>
-                        </div>
-                        <div class="form-btn">
-                        </div>
+                <div class="form-title">
+                    <div class="form-icon">
+                        <img src="/imgs/titleIcon.png" alt="">
+                        <span>项目信息</span>
                     </div>
-                    <div class="qjsjxx-box">
-                        <div class="jbxx-box jbxx-box-flex">
-                            <table class="jbxx-table-info">
-                                <tr>
-                                    <td class="th">
-                                        <div class="form-label">项目名称：</div>
-                                    </td>
-                                    <td>
-                                        <div class="form-group">
-                                            <div class="form-item">
-                                                <div class="z-comp-input z-readonly">
-                                                    <input type="text" value="${(project.xmmc)!}">
-                                                </div>
+                    <div class="form-btn">
+                    </div>
+                </div>
+                <div class="qjsjxx-box">
+                    <div class="jbxx-box jbxx-box-flex">
+                        <table class="jbxx-table-info">
+                            <tr>
+                                <td class="th">
+                                    <div class="form-label">项目名称：</div>
+                                </td>
+                                <td>
+                                    <div class="form-group">
+                                        <div class="form-item">
+                                            <div class="z-comp-input z-readonly">
+                                                <input type="text" value="${(project.xmmc)!}">
                                             </div>
                                         </div>
-                                    </td>
-                                    <td class="th">
-                                        <div class="form-label">项目编号：</div>
-                                    </td>
-                                    <td>
-                                        <div class="form-group">
-                                            <div class="form-item" >
-                                                <div class="z-comp-input z-readonly">
-                                                    <input type="text" value="${(project.xmbh)!}">
-                                                </div>
+                                    </div>
+                                </td>
+                                <td class="th">
+                                    <div class="form-label">项目编号：</div>
+                                </td>
+                                <td>
+                                    <div class="form-group">
+                                        <div class="form-item" >
+                                            <div class="z-comp-input z-readonly">
+                                                <input type="text" value="${(project.xmbh)!}">
                                             </div>
                                         </div>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td class="th">
-                                        <div class="form-label">主合同名称：</div>
-                                    </td>
-                                    <td>
-                                        <div class="form-group">
-                                            <div class="form-item" >
-                                                <div class="z-comp-input z-readonly">
-                                                    <input type="text" value="${(mainContract.name)!}">
-                                                </div>
+                                    </div>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="th">
+                                    <div class="form-label">主合同名称：</div>
+                                </td>
+                                <td>
+                                    <div class="form-group">
+                                        <div class="form-item" >
+                                            <div class="z-comp-input z-readonly">
+                                                <input type="text" value="${(mainContract.name)!}">
                                             </div>
                                         </div>
-                                    </td>
-                                    <td class="th">
-                                        <div class="form-label">主合同编号：</div>
-                                    </td>
-                                    <td>
-                                        <div class="form-group">
-                                            <div class="form-item" >
-                                                <div class="z-comp-input z-readonly">
-                                                    <input type="text" value="${(mainContract.contractNumber)!}">
-                                                </div>
+                                    </div>
+                                </td>
+                                <td class="th">
+                                    <div class="form-label">主合同编号：</div>
+                                </td>
+                                <td>
+                                    <div class="form-group">
+                                        <div class="form-item" >
+                                            <div class="z-comp-input z-readonly">
+                                                <input type="text" value="${(mainContract.contractNumber)!}">
                                             </div>
                                         </div>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td class="th">
-                                        <div class="form-label">主合同金额：</div>
-                                    </td>
-                                    <td>
-                                        <div class="form-group">
-                                            <div class="form-item" >
-                                                <div class="z-comp-input z-readonly">
-                                                    <input type="text" value="${(mainContract.contractAmount)!}">
-                                                </div>
+                                    </div>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="th">
+                                    <div class="form-label">主合同金额：</div>
+                                </td>
+                                <td>
+                                    <div class="form-group">
+                                        <div class="form-item" >
+                                            <div class="z-comp-input z-readonly">
+                                                <input type="text" value="${(mainContract.contractAmount)!}">
                                             </div>
                                         </div>
-                                    </td>
-                                    <td class="th">
-                                        <div class="form-label">责任部门：</div>
-                                    </td>
-                                    <td>
-                                        <div class="form-group">
-                                            <div class="form-item" >
-                                                <div class="z-comp-input z-readonly">
-                                                    <input type="text" value="${(project.zrbm)!}">
-                                                </div>
+                                    </div>
+                                </td>
+                                <td class="th">
+                                    <div class="form-label">责任部门：</div>
+                                </td>
+                                <td>
+                                    <div class="form-group">
+                                        <div class="form-item" >
+                                            <div class="z-comp-input z-readonly">
+                                                <input type="text" value="${(project.zrbm)!}">
                                             </div>
                                         </div>
-                                    </td>
-                                </tr>
+                                    </div>
+                                </td>
+                            </tr>
 
-                            </table>
-                        </div>
+                        </table>
                     </div>
                 </div>
                 <div class="form-title">
@@ -278,71 +276,14 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css' ]>
                                         </div>
                                     </div>
                                 </td>
-<#--                                <td class="th">-->
-<#--                                    <div class="form-label">委托方编号：</div>-->
-<#--                                </td>-->
-<#--                                <td>-->
-<#--                                    <div class="form-group">-->
-<#--                                        <div class="form-item">-->
-<#--                                            <div class="z-comp-input" name="contractSub$clientNumber">-->
-<#--                                                <input type="text" value="${formEntity.clientNumber!}">-->
-<#--                                            </div>-->
-<#--                                        </div>-->
-<#--                                    </div>-->
-<#--                                </td>-->
                             </tr>
-<#--                            <tr>-->
 
-<#--                                <td class="th">-->
-<#--                                    <div class="form-label">区域经理：</div>-->
-<#--                                </td>-->
-<#--                                <td>-->
-<#--                                    <div class="form-group">-->
-<#--                                        <div class="z-comp-selecttree" name="areaManager">-->
-<#--                                            <input type="hidden" name="contractSub$areaManagerId" value="${formEntity.areaManagerId!}">-->
-<#--                                            <input type="hidden" name="contractSub$areaManager" value="${formEntity.areaManager!}">-->
-<#--                                            <div class="z-inputselect-bar">-->
-<#--                                                <span></span><i></i>-->
-<#--                                            </div>-->
-<#--                                        </div>-->
-<#--                                    </div>-->
-<#--                                </td>-->
-                                <#-- <td>--> <#-- <div class="form-label">合同金额：
-          </div>--> <#-- </td>--> <#-- <td>--> <#-- <div class="form-group">--> <#-- <div class="form-item">--> <#-- <div class="z-comp-input" name="contractSub$contractAmount">--> <#-- <input type="text" value="${formEntity.contractAmount!}">--> <#-- </div>--> <#-- </div>--> <#-- </div>--> <#-- </td>-->
-<#--                            </tr>-->
                         </table>
                     </div>
                 </div>
-<#--                <div class="form-title">-->
-<#--                    <div class="form-icon">-->
-<#--                        <img src="/imgs/titleIcon.png" alt="">-->
-<#--                        <span>到期提醒</span>-->
-<#--                    </div>-->
-<#--                    <div class="form-btn">-->
-<#--                    </div>-->
-<#--                </div>-->
-<#--                <div class="qjsjxx-box">-->
-<#--                    <div class="jbxx-box jbxx-box-flex">-->
-<#--                        <table class="jbxx-table-info">-->
-<#--                            <tr>-->
-<#--                                <td class="th">-->
-<#--                                    <div class="form-label">是否到期提醒：</div>-->
-<#--                                </td>-->
-<#--                                <td>-->
-<#--                                    <div class="form-group">-->
-<#--                                        <div class="form-item" >-->
-<#--                                            <div class="z-comp-radio" name="contractSub$isRemindExpiry">-->
-<#--                                                <div class="z-radio-item <#if (formEntity.isRemindExpiry!-1) == 1>checked</#if>" value="1"><i></i>是</div>-->
-<#--                                                <div class="z-radio-item <#if (formEntity.isRemindExpiry!-1) == 0>checked</#if>" value="0"><i></i>否</div>-->
-<#--                                            </div>-->
-<#--                                        </div>-->
-<#--                                    </div>-->
-<#--                                </td>-->
-<#--                                -->
-<#--                            </tr>-->
-<#--                        </table>-->
-<#--                    </div>-->
-<#--                </div>-->
+
+
+            </div>
             <div class="ow-tab-content" name="yj">
                 <#if WORKFLOW.OPINION! !="">
                     <div class="form-title">