进度更新

src/main/java/com/bonus/digitalSignage/backstage/controller/ProProgressController.java

@@ -89,4 +89,11 @@ public class ProProgressController {
     public ServerResponse updateProgressData(EncryptedReq<ProProgressVo.UpdateRecordVo> dto) {
         return service.updateProgressData(dto.getData());
     }
+
+    @ApiOperation("工程进度更新-更新进度-取消回退")
+    @PostMapping("towerGxBack")
+    @DecryptAndVerify(decryptedClass = ProProgressVo.BackTowerGxVo.class)//加解密统一管理
+    public ServerResponse towerGxBack(EncryptedReq<ProProgressVo.BackTowerGxVo> dto) {
+        return service.towerGxBack(dto.getData());
+    }
 }

src/main/java/com/bonus/digitalSignage/backstage/dao/ProProgressDao.java

@@ -123,24 +123,6 @@ public interface ProProgressDao {
      */
     void updateTower(ProProgressVo.UpdateRecordVo vo);
 
-    /**
-     * 杆塔基础开挖完成后，自动生成A腿B腿C腿D腿
-     * @param vo
-     * @return void
-     * @author cwchen
-     * @date 2025/5/19 13:35
-     */
-    void addTowerPouring(ProProgressVo.UpdateRecordVo vo);
-
-    /**
-     * 更新杆塔基础浇筑A、B、C、D四个腿的数据
-     * @param vo
-     * @return void
-     * @author cwchen
-     * @date 2025/5/19 14:44
-     */
-    void updatetTowerPouring(ProProgressVo.UpdateRecordVo vo);
-
     /**
      * 查询已经完成4个腿都浇筑完成的杆塔
      * @param list
@@ -149,4 +131,40 @@ public interface ProProgressDao {
      * @date 2025/5/19 14:52
      */
     List<Long> getTowerPouring(List<Long> list);
+
+    /**
+     * 回退杆塔工序
+     * @param vo
+     * @return void
+     * @author cwchen
+     * @date 2025/6/9 16:16
+     */
+    void updateTowerProgress(ProProgressVo.BackTowerGxVo vo);
+
+    /**
+     * 删除回退杆塔进度记录
+     * @param vo
+     * @return void
+     * @author cwchen
+     * @date 2025/6/9 16:20
+     */
+    void delTowerProgress(ProProgressVo.BackTowerGxVo vo);
+
+    /**
+     * 查询杆塔工序进度
+     * @param vo
+     * @return List<Long>
+     * @author cwchen
+     * @date 2025/6/9 16:29
+     */
+    List<Long> countTowerProgress(ProProgressVo.BackTowerGxVo vo);
+
+    /**
+     * 更新回退后的工程进度
+     * @param vo
+     * @return void
+     * @author cwchen
+     * @date 2025/6/9 16:36
+     */
+    void updateProgress(ProProgressVo.BackTowerGxVo vo);
 }

src/main/java/com/bonus/digitalSignage/backstage/entity/vo/ProProgressVo.java

@@ -136,13 +136,18 @@ public class ProProgressVo {
          */
         private int num7;
         /**
-         * 架线施工完成
+         * 架线施工工序
          */
         private int num8;
         /**
-         * 附件安装完成
+         * 架线施工完成
          */
         private int num9;
+        /**
+         * 附件安装完成
+         */
+        private int num10;
+
     }
 
     @Data
@@ -154,7 +159,7 @@ public class ProProgressVo {
          */
         private String towerName;
         /**
-         * 杆塔完成进度 1.基础开挖 2.基础开挖完成 3.基础浇筑完成 4.铁塔组立 5.铁塔组立完成 6.架线施工完成 7.附件安装完成
+         * 杆塔完成进度 1.协调完成 2.基础开挖 3.基础开挖完成 4.基础浇筑 5.基础浇筑完成 6.铁塔组立 7.铁塔组立完成 8.架线施工  9.架线施工完成 10.附件安装完成
          */
         private int towerProgress;
 
@@ -197,7 +202,7 @@ public class ProProgressVo {
         private Date updateDate;
 
         /**
-         * 工序类型 1.基础开挖 2.基础开挖完成 3.基础浇筑完成 4.铁塔组立 5.铁塔组立完成 6.架线施工完成 7.附件安装完成
+         * 工序类型 1.协调完成 2.基础开挖 3.基础开挖完成 4.基础浇筑 5.基础浇筑完成 6.铁塔组立 7.铁塔组立完成 8.架线施工  9.架线施工完成 10.附件安装完成
          */
         @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
         private Integer progressType;
@@ -222,12 +227,8 @@ public class ProProgressVo {
         @Size(min = 1, message = "至少选择一个杆塔数据", groups = {Update.class})
         private List<Long> towerIds;
 
-        private List<Long> towerLegIds = new ArrayList<>();
-
         private List<TowerDetailVo> towerDetailVos;
 
-        /**杆塔腿*/
-        private List<String> innerLoops = Arrays.asList("A", "B", "C", "D");
 
         /**
          * 修改条件限制
@@ -237,4 +238,21 @@ public class ProProgressVo {
 
     }
 
+    @Data
+    public static class BackTowerGxVo{
+        @NotNull(message = "工程不能为空", groups = {Update.class})
+        private Long proId;
+        @NotNull(message = "杆塔不能为空", groups = {Update.class})
+        private Long towerId;
+        @NotNull(message = "回退工序不能为空", groups = {Update.class})
+        private Integer towerProgress;
+        /**进度*/
+        private double progress;
+        /**
+         * 修改条件限制
+         */
+        public interface Update {
+        }
+    }
+
 }

src/main/java/com/bonus/digitalSignage/backstage/service/ProProgressService.java

@@ -77,4 +77,13 @@ public interface ProProgressService {
      * @date 2025/4/22 13:38
      */
     ServerResponse updateProgressData(ProProgressVo.UpdateRecordVo vo);
+
+    /**
+     * 工程进度更新-更新进度-取消回退
+     * @param data
+     * @return ServerResponse
+     * @author cwchen
+     * @date 2025/6/9 16:07
+     */
+    ServerResponse towerGxBack(ProProgressVo.BackTowerGxVo data);
 }

src/main/java/com/bonus/digitalSignage/backstage/service/impl/ProProgressServiceImpl.java

@@ -92,6 +92,7 @@ public class ProProgressServiceImpl implements ProProgressService {
             vo.setNum7(vo2.getNum7());
             vo.setNum8(vo2.getNum8());
             vo.setNum9(vo2.getNum9());
+            vo.setNum10(vo2.getNum10());
             return ServerResponse.createSuccess(vo);
         } catch (Exception e) {
             log.error(e.toString(), e);
@@ -157,33 +158,13 @@ public class ProProgressServiceImpl implements ProProgressService {
             List<Long> progressAndTowers = Optional.ofNullable(dao.getNowProProgress(vo)).orElseGet(ArrayList::new);
             Long finishTowerNum = progressAndTowers.get(0);
             Long towerNum = progressAndTowers.get(1);
-            // 杆塔基础开挖完成后，自动生成A腿B腿C腿D腿
-            if (vo.getProgressType() == 3) {
-                dao.addTowerPouring(vo);
-            }
-            // 工序进度为基础浇筑时
-            if (vo.getProgressType() == 4) {
-                // 更新杆塔基础浇筑A、B、C、D四个腿的数据
-                dao.updatetTowerPouring(vo);
-                // 查询已经完成4个腿都浇筑完成的杆塔
-                Set<Long> set = new HashSet<>(vo.getTowerIds());
-                List<Long> distinctList = new ArrayList<>(set);
-                List<Long> towerPourings = Optional.ofNullable(dao.getTowerPouring(distinctList)).orElseGet(ArrayList::new);
-                vo.setTowerLegIds(towerPourings);
-            }
             // 计算更新后的进度
-            double progress = handleProgress(finishTowerNum, towerNum, vo.getProgressType() != 4 ? vo.getTowerIds().size():vo.getTowerLegIds().size());
+            double progress = handleProgress(1,finishTowerNum, towerNum, vo.getTowerIds().size());
             vo.setFinishProgress(progress);
             // 添加杆塔进度、杆塔进度关系表、更新工程整体进度、更新杆塔进度
             dao.addProgress(vo);
-            if (vo.getProgressType() == 4 && CollectionUtils.isNotEmpty(vo.getTowerLegIds())) {
-                dao.addTowerProgress(vo);
-                dao.updateTower(vo);
-            }
-            if (vo.getProgressType() != 4) {
-                dao.addTowerProgress(vo);
-                dao.updateTower(vo);
-            }
+            dao.addTowerProgress(vo);
+            dao.updateTower(vo);
             dao.updateProProgress(vo);
             return ServerResponse.createBySuccessMsg("操作成功");
         } catch (Exception e) {
@@ -193,6 +174,33 @@ public class ProProgressServiceImpl implements ProProgressService {
         }
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ServerResponse towerGxBack(ProProgressVo.BackTowerGxVo vo) {
+        try {
+            // 校验数据是否合法
+            String validResult = validatorsUtils.valid(vo, ProProgressVo.BackTowerGxVo.Update.class);
+            if (StringUtils.isNotBlank(validResult)) {
+                return ServerResponse.createErroe(validResult);
+            }
+            vo.setTowerProgress(vo.getTowerProgress() - 1);
+            dao.updateTowerProgress(vo);
+            dao.delTowerProgress(vo);
+            // 查询杆塔工序进度
+            List<Long> countTowerProgress = Optional.ofNullable(dao.countTowerProgress(vo)).orElseGet(ArrayList::new);
+            // 计算更新后的进度
+            double progress = handleProgress(2,countTowerProgress.get(1), countTowerProgress.get(0), 0);
+            vo.setProgress(progress);
+            // 更新工程进度
+            dao.updateProgress(vo);
+            return ServerResponse.createBySuccessMsg("操作成功");
+        } catch (Exception e) {
+            log.error(e.toString(), e);
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return ServerResponse.createErroe("操作失败");
+        }
+    }
+
     /**
      * 计算进度
      *
@@ -203,9 +211,14 @@ public class ProProgressServiceImpl implements ProProgressService {
      * @author cwchen
      * @date 2025/4/22 14:57
      */
-    public static double handleProgress(Long nowProgress, Long towerNum, int towerNum2) {
-        BigDecimal bigDecimal = BigDecimal.valueOf(nowProgress + (long) towerNum2).multiply(BigDecimal.valueOf(100));
-        BigDecimal bigDecimal2 = BigDecimal.valueOf(towerNum * 9);
+    public static double handleProgress(int type,Long nowProgress, Long towerNum, int towerNum2) {
+        BigDecimal bigDecimal = null;
+        if(type == 1){ // 工序更新
+            bigDecimal = BigDecimal.valueOf(nowProgress + (long) towerNum2).multiply(BigDecimal.valueOf(100));
+        }else{ // 工序回退
+            bigDecimal = BigDecimal.valueOf(nowProgress).multiply(BigDecimal.valueOf(100));
+        }
+        BigDecimal bigDecimal2 = BigDecimal.valueOf(towerNum * 10);
         BigDecimal result = bigDecimal.divide(bigDecimal2, 2, RoundingMode.HALF_UP);
         return result.doubleValue();
     }

src/main/resources/mappers/backstage/ProProgressMapper.xml

@@ -21,22 +21,12 @@
     </insert>
     <!--杆塔进度关系表-->
     <insert id="addTowerProgress">
-        <if test="progressType == 4">
-            INSERT INTO tb_tower_progress(tower_id,progress_id,progress_type,pro_id) VALUES
-            <foreach collection="towerLegIds" separator="," item="item">
-                (
-                #{item},#{dataId},#{progressType},#{id}
-                )
-            </foreach>
-        </if>
-        <if test="progressType != 4">
-            INSERT INTO tb_tower_progress(tower_id,progress_id,progress_type,pro_id) VALUES
-            <foreach collection="towerIds" separator="," item="item">
-                (
-                #{item},#{dataId},#{progressType},#{id}
-                )
-            </foreach>
-        </if>
+        INSERT INTO tb_tower_progress(tower_id,progress_id,progress_type,pro_id) VALUES
+        <foreach collection="towerIds" separator="," item="item">
+            (
+            #{item},#{dataId},#{progressType},#{id}
+            )
+        </foreach>
     </insert>
     <!--杆塔基础开挖完成后，自动生成A腿B腿C腿D腿-->
     <insert id="addTowerPouring">
@@ -56,32 +46,26 @@
     </update>
     <!--更新杆塔进度-->
     <update id="updateTower">
-        <if test="progressType == 4">
-            <foreach collection="towerLegIds" item="item" index="index" separator=";">
-                UPDATE tb_tower
-                SET
-                tower_progress = #{progressType}
-                WHERE id = #{item}
-            </foreach>
-        </if>
-        <if test="progressType != 4">
-            <foreach collection="towerIds" item="item" index="index" separator=";">
-                UPDATE tb_tower
-                SET
-                tower_progress = #{progressType}
-                WHERE id = #{item}
-            </foreach>
-        </if>
-    </update>
-    <!--更新杆塔基础浇筑A、B、C、D四个腿的数据-->
-    <update id="updatetTowerPouring">
-        <foreach collection="towerDetailVos" item="item" index="index" separator=";">
-            UPDATE tb_tower_pouring
+        <foreach collection="towerIds" item="item" index="index" separator=";">
+            UPDATE tb_tower
             SET
-            finish_status = '1'
-            WHERE tower_id = #{item.id} AND leg = #{item.towerName}
+            tower_progress = #{progressType}
+            WHERE id = #{item}
         </foreach>
     </update>
+    <!--回退杆塔工序-->
+    <update id="updateTowerProgress">
+        UPDATE tb_tower SET tower_progress = #{towerProgress} WHERE id = #{towerId}
+    </update>
+    <!--更新回退后的工程进度-->
+    <update id="updateProgress">
+        UPDATE tb_project SET pro_progress = #{progress} WHERE id = #{proId}
+    </update>
+    <!--删除回退杆塔进度记录-->
+    <delete id="delTowerProgress">
+        DELETE FROM tb_tower_progress WHERE tower_id = #{towerId} AND progress_type > #{towerProgress}
+    </delete>
+
 
     <!--工程进度更新-查询列表-->
     <select id="getList" resultType="com.bonus.digitalSignage.backstage.entity.vo.ProProgressVo">
@@ -174,6 +158,7 @@
                COUNT(IF(tower_progress &gt;= 7, 1, NULL)) AS num7,
                COUNT(IF(tower_progress &gt;= 8, 1, NULL)) AS num8,
                COUNT(IF(tower_progress &gt;= 9, 1, NULL)) AS num9,
+               COUNT(IF(tower_progress &gt;= 10, 1, NULL)) AS num10,
                COUNT(*) AS towerNum
         FROM tb_tower WHERE pro_id = #{id} AND is_actvice = '1'
     </select>
@@ -194,50 +179,20 @@
     <select id="getGxData"
             resultType="com.bonus.digitalSignage.backstage.entity.vo.ProProgressVo$TowerDetailVo">
         SELECT * FROM (
-              SELECT tt.id,
-                    <if test="type == 4">
-                        CONCAT(tt.tower_name,'-',ttp.leg) AS towerName,
-                        ttp.leg,
-                    </if>
-                    <if test="type != 4">
-                        tt.tower_name AS towerName,
-                        0 AS leg,
-                    </if>
+              SELECT id,
+                     tower_name AS towerName,
                      1 AS chooseStatus,
-                     tt.sort
-              FROM tb_tower tt
-              <if test="type == 4">
-                  LEFT JOIN tb_tower_pouring ttp ON tt.id = ttp.tower_id AND tt.tower_progress = 3
-              </if>
-              WHERE tt.pro_id = #{id} AND tt.tower_progress = #{type} - 1 AND tt.is_actvice = '1'
-                <if test="type == 4">
-                    AND ttp.finish_status = '0'
-                </if>
+                     sort,
+                     tower_progress AS towerProgress
+              FROM tb_tower WHERE pro_id = #{id} AND tower_progress = #{type} - 1 AND is_actvice = '1'
               UNION ALL
-              SELECT tt.id,
-                    <if test="type == 4">
-                        CONCAT(tt.tower_name,'-',ttp.leg) AS towerName,
-                        ttp.leg,
-                    </if>
-                    <if test="type != 4">
-                        tt.tower_name AS towerName,
-                        0 AS leg,
-                    </if>
+              SELECT id,
+                     tower_name AS towerName,
                      0 AS chooseStatus,
-                     tt.sort
-              FROM tb_tower tt
-                <if test="type == 4">
-                    LEFT JOIN tb_tower_pouring ttp ON tt.id = ttp.tower_id AND tt.tower_progress &gt;= #{type} - 1
-                </if>
-              WHERE tt.pro_id = #{id}  AND tt.is_actvice = '1'
-                <if test="type != 4">
-                    AND tt.tower_progress &gt;= #{type}
-                </if>
-                <if test="type == 4">
-                    AND tt.tower_progress &gt;= #{type} - 1
-                    AND ttp.finish_status = '1'
-                </if>
-        ) A ORDER BY sort,leg
+                     sort,
+                     tower_progress AS towerProgress
+              FROM tb_tower WHERE pro_id = #{id} AND tower_progress &gt;= #{type} AND is_actvice = '1'
+      ) A ORDER BY sort
     </select>
     <!--查询杆塔进度是否被重复更新-->
     <select id="getIsRepeatUpdate" resultType="java.lang.Integer">
@@ -270,4 +225,14 @@
         GROUP BY ttp.tower_id
         HAVING COUNT(DISTINCT ttp.leg) = 4
     </select>
+    <!--查询杆塔工序进度-->
+    <select id="countTowerProgress" resultType="java.lang.Long">
+        SELECT COUNT(*)
+        FROM tb_tower
+        WHERE pro_id = #{proId} AND is_actvice = '1'
+        UNION ALL
+        SELECT IFNULL(SUM(tower_progress),0)
+        FROM tb_tower
+        WHERE pro_id = #{proId} AND is_actvice = '1'
+    </select>
 </mapper>

src/main/resources/static/css/synthesisQuery/proProgressUpdateDetail.css

@@ -119,6 +119,10 @@ body {
     color: #1afa29;
 }
 
+.num-box:nth-child(11) > p:nth-child(2) {
+    color: #7dc5eb;
+}
+
 .layui-tab-brief > .layui-tab-title .layui-this {
     color: #409eff;
 }
@@ -188,7 +192,7 @@ body {
     overflow-y: auto;
 }
 
-.tower-info {
+.tower-info,.tower-progress {
     min-width: 70px;
     height: 40px;
     margin: 10px;
@@ -198,7 +202,7 @@ body {
     cursor: pointer;
 }
 
-.tower-info p{
+.tower-info p,.tower-progress p{
     padding: 0 5px;
 }
 
@@ -236,4 +240,20 @@ a:focus {
 
 .layui-tab-item {
     height: 100%;
+}
+
+.box-title{
+    width: 100%;
+    height: 40px;
+}
+
+.tower-progress-box{
+    width: 100%;
+    height: 60px;
+    justify-content: start;
+}
+
+.box-title p{
+    font-weight: bold;
+    font-size: 18px;
 }

src/main/resources/static/js/synthesisQuery/backGxForm.js

@@ -0,0 +1,79 @@
+let form, layer, element, table, tableIns;
+let objParams = {},checkType = 1;
+
+function setParams(obj) {
+    objParams = JSON.parse(obj);
+    layui.use(['form', 'layer', 'element', 'table'], function () {
+        form = layui.form;
+        layer = layui.layer;
+        table = layui.table;
+        element = layui.element;
+        getBackGxData();
+    });
+}
+// 工序进度
+let towerProgressList = [{name:'协调完成',value:1},{name:'基础开挖',value:2},{name:'基础开挖完成',value:3},{name:'基础浇筑',value:4},{name:'基础浇筑完成',value:5},{name:'铁塔组立',value:6},{name:'铁塔组立完成',value:7},{name:'架线施工',value:8},{name:'架线施工完成',value:9},{name:'附件安装完成',value: 10}];
+// 选中回退的杆塔
+function checkData(that){
+    $('.tower-info').each(function(){
+        if ($(this).hasClass('choose')) {
+            $(this).removeClass('choose');
+        }
+    });
+    $(that).addClass('choose');
+    let towerProgress = $(that).attr('towerProgress');
+    getTowerProgressName(towerProgress);
+
+    function getTowerProgressName(towerProgress) {
+       let filterList =  towerProgressList.filter(item => {
+            if(item.value <= parseInt(towerProgress)){
+                return item;
+            }
+        })
+        let html = '';
+        $.each(filterList, function (index, item) {
+            html += '<div class="tower-progress layout" name="'+item.name+'" value="' + item.value + '" onclick="checkData2(this)"><p>' + item.name + '</p></div>';
+        })
+        $('.tower-progress-box').empty().append(html);
+    }
+}
+
+// 选中需要回退的工序
+function checkData2(that){
+    $('.tower-progress').each(function(){
+        if ($(this).hasClass('choose')) {
+            $(this).removeClass('choose');
+        }
+    });
+    $(that).addClass('choose');
+}
+
+function saveData2() {
+    let obj = {};
+    $('.tower-info.choose').each(function(){
+         obj = {
+             towerId: $(this).attr('dataId'),
+             towerName: $(this).attr('towerName')
+        }
+    });
+    $('.tower-progress.choose').each(function(){
+        obj.towerProgress = $(this).attr('value');
+        obj.name = $(this).attr('name');
+    });
+    console.error(obj)
+    if(!obj.towerId){
+        return layer.msg('请选择杆塔',{icon:7});
+    }
+    if(!obj.towerProgress){
+        return layer.msg('请选择回退工序',{icon:7});
+    }
+    layer.confirm('回退杆塔：'+obj.towerName+'，工序：'+obj.name+'，是否确认？', {title:'操作提示'},function(){
+        towerBackAjax(obj);
+    })
+}
+
+// 关闭页面
+function closePage() {
+    let index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
+    parent.layer.close(index); //再执行关闭
+}

src/main/resources/static/js/synthesisQuery/proProgressUpdateDetail.js

@@ -92,13 +92,13 @@ function initTable(dataList, limit, page) {
                         return (page - 1) * limit + d.LAY_NUM;
                     }
                 },
-                {field: "towerName", title: "杆塔", width: "14%", unresize: true, align: "center"},
-                {title: "协调完成",width: "10%",unresize: true,align: "center",
+                {field: "towerName", title: "杆塔", width: "10%", unresize: true, align: "center"},
+                {title: "协调完成",width: "8%",unresize: true,align: "center",
                     templet: function (d) {
                         return setTowerProgress(d.towerProgress,1);
                     }
                 },
-                {title: "基础开挖",width: "9%",unresize: true,align: "center",
+                {title: "基础开挖",width: "8%",unresize: true,align: "center",
                     templet: function (d) {
                         return setTowerProgress(d.towerProgress,2);
                     }
@@ -108,7 +108,7 @@ function initTable(dataList, limit, page) {
                         return setTowerProgress(d.towerProgress,3);
                     }
                 },
-                {title: "基础浇筑",width: "9%",unresize: true,align: "center",
+                {title: "基础浇筑",width: "8%",unresize: true,align: "center",
                     templet: function (d) {
                         return setTowerProgress(d.towerProgress,4);
                     }
@@ -118,7 +118,7 @@ function initTable(dataList, limit, page) {
                         return setTowerProgress(d.towerProgress,5);
                     }
                 },
-                {title: "铁塔组立",width: "9%",unresize: true,align: "center",
+                {title: "铁塔组立",width: "8%",unresize: true,align: "center",
                     templet: function (d) {
                         return setTowerProgress(d.towerProgress,6);
                     }
@@ -128,16 +128,21 @@ function initTable(dataList, limit, page) {
                         return setTowerProgress(d.towerProgress,7);
                     }
                 },
-                {title: "架线施工完成",width: "9%",unresize: true,align: "center",
+                {title: "架线施工",width: "9%",unresize: true,align: "center",
                     templet: function (d) {
                         return setTowerProgress(d.towerProgress,8);
                     }
                 },
-                {title: "附件安装完成",width: "9%",unresize: true,align: "center",
+                {title: "架线施工完成",width: "9%",unresize: true,align: "center",
                     templet: function (d) {
                         return setTowerProgress(d.towerProgress,9);
                     }
                 },
+                {title: "附件安装完成",width: "9%",unresize: true,align: "center",
+                    templet: function (d) {
+                        return setTowerProgress(d.towerProgress,10);
+                    }
+                },
             ],
         ],
         done: function (res, curr, count) {
@@ -200,6 +205,8 @@ function setTowerProgress(value,type){
         html = '<img src="../../img/synthesisQuery/num8.png" alt="">'
     }else if(value >= 9 && type === 9){
         html = '<img src="../../img/synthesisQuery/num9.png" alt="">'
+    }else if(value >= 10 && type === 10){
+        html = '<img src="../../img/synthesisQuery/num10.png" alt="">'
     }else {
         html = '';
     }
@@ -211,6 +218,10 @@ function updatePro(){
     openIframeByParamObj("updatePro", "更新项目", "./updateProForm.html", "92%", "95%", objParams,'updatePro');
 }
 
+function backGx(){
+    openIframeByParamObj("updatePro", "取消回退", "./backGxForm.html", "92%", "95%", objParams,'updatePro');
+}
+
 function reloadData(){
     if(checkType === '1'){
         initSetProData();

src/main/resources/static/js/synthesisQuery/proProgressUpdateDetailAjax.js

@@ -36,7 +36,7 @@ function initSetProData() {
                  <div class="layui-progress-bar layui-bg-blue" lay-percent="${obj.proProgress}%"></div>
              </div>
            `);
-        for (let i = 1; i <= 9; i++) {
+        for (let i = 1; i <= 10; i++) {
             $('#num' + i).html(obj['num' + i]);
         }
         element.render();
@@ -135,7 +135,7 @@ function setUpdateProData(value) {
         let obj = data.vo;
         let list = data.list;
         $('#towerNum2').html(obj.towerNum);
-        for (let i = 1; i <= 9; i++) {
+        for (let i = 1; i <= 10; i++) {
             $('#num' + i).html(obj['num' + i]);
         }
         let html = '';
@@ -181,8 +181,10 @@ function chooseData(that) {
         } else if (checkType === 7) {
             return towerName + '-' + '铁塔组立完成;';
         } else if (checkType === 8) {
+            return towerName + '-' + '架线施工;';
+        }else if (checkType === 9) {
             return towerName + '-' + '架线施工完成;';
-        } else if (checkType === 9) {
+        } else if (checkType === 10) {
             return towerName + '-' + '附件安装完成;';
         }
     }
@@ -220,4 +222,69 @@ function saveData(data, towers, towerNames) {
         $('.cancel').removeClass("layui-btn-disabled").attr("disabled", false);
         error(xhr)
     });
+}
+
+/**取消回退*/
+function getBackGxData() {
+    let url = dataUrl + "/backstage/proProgress/getGxData"
+    let obj = {
+        id: objParams.id,
+        type: 0
+    }
+    let params = {
+        encryptedData: encryptCBC(JSON.stringify(obj))
+    }
+    let loadingMsg = layer.msg("数据加载中,请稍候...", {icon: 16, scrollbar: false, time: 0,});
+    ajaxRequest(url, "POST", params, true, function () {
+    }, function (result) {
+        layer.close(loadingMsg);
+        if (result.status === 200) {
+            setData(result.data);
+        } else {
+            layer.msg(result.msg, {icon: 2})
+        }
+    }, function (xhr) {
+        layer.close(loadingMsg);
+        error(xhr)
+    });
+
+    function setData(data) {
+        let list = data.list;
+        let html = '';
+        $.each(list, function (index, item) {
+            html += '<div class="tower-info layout" dataId="' + item.id + '" towerName="' + item.towerName + '" towerProgress="'+item.towerProgress+'"   onclick="checkData(this)"><p>' + item.towerName + '</p></div>';
+        })
+        $('.tower-box').empty().append(html);
+    }
+}
+
+// 杆塔回退
+function towerBackAjax(obj) {
+    obj.proId = objParams.id;
+    let url = dataUrl + "/backstage/proProgress/towerGxBack";
+    let paramsObj = obj;
+    let params = {
+        encryptedData: encryptCBC(JSON.stringify(paramsObj))
+    }
+    let loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0});
+    ajaxRequest(url, "POST", params, true, function () {
+        $('.save').addClass("layui-btn-disabled").attr("disabled", true);
+        $('.cancel').addClass("layui-btn-disabled").attr("disabled", true);
+    }, function (result) {
+        layer.close(loadingMsg); // 关闭提示层
+        $('.save').removeClass("layui-btn-disabled").attr("disabled", false);
+        $('.cancel').removeClass("layui-btn-disabled").attr("disabled", false);
+        if (result.code === 200) {
+            parent.layer.msg(result.msg, {icon: 1});
+            getBackGxData();
+            $('.tower-progress-box').empty();
+        } else {
+            layer.msg(result.msg, {icon: 2})
+        }
+    }, function (xhr) {
+        layer.close(loadingMsg); // 关闭提示层
+        $('.save').removeClass("layui-btn-disabled").attr("disabled", false);
+        $('.cancel').removeClass("layui-btn-disabled").attr("disabled", false);
+        error(xhr)
+    });
 }

src/main/resources/static/pages/synthesisQuery/backGxForm.html

@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <link rel="stylesheet" href="../../js/layui-v2.9.14/layui/css/layui.css">
+    <link rel="stylesheet" href="../../css/font.css">
+    <link rel="stylesheet" href="../../css/synthesisQuery/proProgressUpdateDetail.css">
+    <script src="../../js/libs/jquery-3.7.0.min.js" charset="UTF-8" type="text/javascript"></script>
+    <script src="../../js/layui-v2.9.14/layui/layui.js" charset="UTF-8" type="text/javascript"></script>
+    <script src="../../js/publicJs.js"></script>
+    <script src="../../js/commonUtils.js"></script>
+    <script src="../../js/openIframe.js"></script>
+    <script src="../../js/my/aes.js"></script>
+    <script src="../../js/ajaxRequest.js"></script>
+    <title>更新项目</title>
+</head>
+<style>
+    #data-box {
+        height: 100%;
+    }
+
+    #data-box-content {
+        height: 100%;
+    }
+    .tower-box {
+        max-height: calc(100% - 340px);
+    }
+
+</style>
+<body>
+<div id="main-box">
+    <div id="data-box">
+        <div class="layui-tab layui-tab-brief" style="height: 98%;" lay-filter="demo-filter-tab">
+            <div class="layui-tab-content" style="height: calc(100% - 60px);" id="layui-tab-content">
+                <div class="layui-tab-item layui-show">
+                    <div class="data-box-content" id="data-box-content">
+                        <div class="box-title">
+                            <p>杆塔：</p>
+                        </div>
+                        <div class="tower-box layout">
+                        </div>
+                        <div class="box-title">
+                            <p>当前杆塔已完成工序：</p>
+                        </div>
+                        <div class="tower-progress-box layout">
+                        </div>
+                        <div class="btn-box">
+                            <button class="layui-btn layui-btn-norma save" onclick="saveData2()">回退</button>
+                            <button class="layui-btn layui-btn-primary cancel" onclick="closePage()">取消</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</div>
+</body>
+<script src="../../js/synthesisQuery/proProgressUpdateDetailAjax.js" charset="UTF-8" type="text/javascript"></script>
+<script src="../../js/synthesisQuery/backGxForm.js" charset="UTF-8" type="text/javascript"></script>
+</html>

src/main/resources/static/pages/synthesisQuery/proProgressUpdateDetail.html

@@ -29,6 +29,9 @@
             <button type="button" class="layui-btn layui-bg-blue no-print" onclick="updatePro()"><i
                     class="layui-icon layui-icon-edit"></i>更新项目
             </button>
+            <button type="button" class="layui-btn layui-bg-blue no-print" onclick="backGx()"><i
+                    class="layui-icon layui-icon-return"></i>取消回退
+            </button>
         </div>
     </div>
     <div id="pro-basic-detail-box" class="layout">
@@ -107,13 +110,17 @@
                                 <p id="num7">0</p>
                             </div>
                             <div class="layout num-box">
-                                <p>架线施工完成</p>
+                                <p>架线施工</p>
                                 <p id="num8">0</p>
                             </div>
                             <div class="layout num-box">
-                                <p>附件安装完成</p>
+                                <p>架线施工完成</p>
                                 <p id="num9">0</p>
                             </div>
+                            <div class="layout num-box">
+                                <p>附件安装完成</p>
+                                <p id="num10">0</p>
+                            </div>
                         </div>
                         <div class="table-box" table-responsive style="z-index: 1;">
                             <table id="table_data" class="table" lay-filter="table_data"></table>

src/main/resources/static/pages/synthesisQuery/updateProForm.html

@@ -37,8 +37,9 @@
                 <li value="5">基础浇筑完成</li>
                 <li value="6">铁塔组立</li>
                 <li value="7">铁塔组立完成</li>
-                <li value="8">架线施工完成</li>
-                <li value="9">附件安装完成</li>
+                <li value="8">架线施工</li>
+                <li value="9">架线施工完成</li>
+                <li value="10">附件安装完成</li>
             </ul>
             <div class="layui-tab-content" style="height: calc(100% - 60px);" id="layui-tab-content">
                 <div class="layui-tab-item layui-show">
@@ -77,13 +78,18 @@
                                 <p id="num7">0</p>
                             </div>
                             <div class="layout num-box">
-                                <p>架线施工完成</p>
+                                <p>架线施工</p>
                                 <p id="num8">0</p>
                             </div>
                             <div class="layout num-box">
-                                <p>附件安装完成</p>
+                                <p>架线施工完成</p>
                                 <p id="num9">0</p>
                             </div>
+                            <div class="layout num-box">
+                                <p>附件安装完成</p>
+                                <p id="num10">0</p>
+                            </div>
+
                         </div>
                         <div class="tower-box layout">
                         </div>