合同计量单元排序修改

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/MeterTreeController.java

@@ -736,7 +736,7 @@ public class MeterTreeController extends BladeController {
                     " WHERE c.is_deleted = 0 AND c.contract_meter_id = a.id) AS isDecompositionData" +
                     " FROM s_meter_tree_contract a WHERE a.contract_id = " + contractId +
                     " AND a.is_deleted = 0 AND a.status = 1 AND a.parent_id = " + id +
-                    " ORDER BY -a.sort desc,a.create_time";
+                    " ORDER BY -a.sort desc,a.create_time,a.node_name";
             List<MeterTreeContractTreeVO> query = jdbcTemplate.query(sql,
                     new BeanPropertyRowMapper<>(MeterTreeContractTreeVO.class));
             return R.data(query);

blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/MeterTreeContractMapper.xml

@@ -53,7 +53,7 @@
                if((select count(1) from s_meter_tree_contract mtc2 where mtc2.project_id = #{projectId}
                     and mtc2.contract_id = #{contractId} and is_deleted = 0 and mtc2.parent_id = mtc1.id) = 0,'false','true') as hasChild
         from s_meter_tree_contract mtc1 where project_id = #{projectId} and contract_id = #{contractId} and is_deleted = 0
-        ORDER BY -mtc1.sort desc,mtc1.create_time
+        ORDER BY -mtc1.sort desc,mtc1.create_time,mtc1.node_name
     </select>
     <select id="getWBSTree" resultType="org.springblade.meter.vo.MeterFullTreeVO">
         select p_key_id,id, if(full_name is null,node_name,full_name) as node_name,parent_id,

blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/MiddleMeterApplyMapper.xml

@@ -344,7 +344,7 @@
                     where uiq.contract_id = #{contractId} and uiq.classify = 1 and uiq.wbs_id = wtc.p_key_id
                       and uiq.type = 1 and uiq.status != 3 and uiq.is_deleted = 0 ) as appStatus,
                (select ifnull(MAX(mtf.type),0) from m_table_file mtf
-                    where mtf.contract_id = #{contractId} and mtf.tab_id = wtc.p_key_id and mtf.is_deleted = 0) as maxType,
+                    where mtf.contract_id = #{contractId} and mtf.tab_id = wtc.p_key_id and mtf.is_deleted = 0) as maxType
         from m_wbs_tree_contract wtc
         where p_key_id in
         <foreach collection="ids" item="id" open="(" separator="," close=")">

blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/MiddleMeterApplyServiceImpl.java

@@ -625,7 +625,7 @@ public class MiddleMeterApplyServiceImpl extends BaseServiceImpl<MiddleMeterAppl
                 //获取每个节点的附件
                 Integer max = baseMapper.getMeterWbsFileMaxType(treeContract.getContractId(),treeContract.getId());
                 //判断附件中是否存在7天28天附件，如果不存在则提示：关联WBS节点中的附近已被删除，请重新上传
-                if (max == null || (max != 11 || max != 12)){
+                if (max == null || (max != 11 && max != 12)){
                     throw new ServiceException("关联WBS节点中的附件已被删除，请重新上传附件");
                 }else {
                     if (max == 11) {
@@ -1285,6 +1285,7 @@ public class MiddleMeterApplyServiceImpl extends BaseServiceImpl<MiddleMeterAppl
                     inventoryFormApply.setProjectId(projectId);
                     inventoryFormApply.setContractId(contractId);
                     inventoryFormApply.setMiddleMeterId(middleId);
+                    inventoryFormApply.setMeterNumber(prefix+count);
                     inventoryFormApply.setContractFormId(vo.getContractFormId());
                     inventoryFormApply.setContractMeterId(vo.getContractMeterId());
                     inventoryFormApply.setContractPeriodId(periodId);