更新中图代码

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/controller/business/ZtCqBcbzItemController.java

@@ -41,7 +41,7 @@ public class ZtCqBcbzItemController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(ZtCqBcbzItem ztCqBcbzItem)
     {
-        startPage();
+//        startPage();
         List<ZtCqBcbzItem> list = ztCqBcbzItemService.selectZtCqBcbzItemList(ztCqBcbzItem);
         return getDataTable(list);
     }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/controller/business/ZtCqBcbzListController.java

@@ -3,6 +3,10 @@ package com.onemap.sanya.controller.business;
 import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+
+import com.onemap.common.core.utils.uuid.UUID;
+import com.onemap.sanya.domain.business.ZtCqBcbzItem;
+import com.onemap.sanya.service.IZtCqBcbzItemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -34,6 +38,8 @@ public class ZtCqBcbzListController extends BaseController
 {
     @Autowired
     private IZtCqBcbzListService ztCqBcbzListService;
+    @Autowired
+    private IZtCqBcbzItemService ztCqBcbzItemService;
     /**
     3+.   */
     @GetMapping("/list")
@@ -70,8 +76,20 @@ public class ZtCqBcbzListController extends BaseController
      */
     @Log(title = "拆迁补偿标准列", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody ZtCqBcbzList ztCqBcbzList)
-    {
+    public AjaxResult add(@RequestBody ZtCqBcbzList ztCqBcbzList) {
+        String pUuid = UUID.randomUUID().toString().replace("-", "").toUpperCase();
+        ztCqBcbzList.setId(pUuid);
+        String uuid = "";
+        List<ZtCqBcbzItem> items = ztCqBcbzList.getBcbz();
+        if (items != null) {
+            for (ZtCqBcbzItem item : items) {
+                uuid = UUID.randomUUID().toString().replace("-", "").toUpperCase();
+                item.setPid(pUuid);
+                item.setId(uuid);
+                ztCqBcbzItemService.insertZtCqBcbzItem(item);
+            }
+        }
+
         return toAjax(ztCqBcbzListService.insertZtCqBcbzList(ztCqBcbzList));
     }
 
@@ -82,6 +100,16 @@ public class ZtCqBcbzListController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody ZtCqBcbzList ztCqBcbzList)
     {
+        if(ztCqBcbzList!=null&&ztCqBcbzList.getBcbz().size()>0)
+        {
+            List<ZtCqBcbzItem> items= ztCqBcbzList.getBcbz();
+            if (items!=null) {
+                for (ZtCqBcbzItem item : items) {
+                    item.setPid(ztCqBcbzList.getId());
+                    ztCqBcbzItemService.updateZtCqBcbzItem(item);
+                }
+            }
+        }
         return toAjax(ztCqBcbzListService.updateZtCqBcbzList(ztCqBcbzList));
     }
 

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/controller/business/ZtQmBcbzListController.java

@@ -3,6 +3,8 @@ package com.onemap.sanya.controller.business;
 import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+
+import com.onemap.common.core.utils.uuid.UUID;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -74,6 +76,8 @@ public class ZtQmBcbzListController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody ZtQmBcbzList ztQmBcbzList)
     {
+        String uuid = UUID.randomUUID().toString().replace("-", "").toUpperCase();
+        ztQmBcbzList.setId(uuid);
         return toAjax(ztQmBcbzListService.insertZtQmBcbzList(ztQmBcbzList));
     }
 

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/controller/business/ZtZdProjectListController.java

@@ -186,7 +186,7 @@ public class ZtZdProjectListController extends BaseController
                 zdReultList.setGydlData(mapper.readValue(zdReultList.getGydlList(), new TypeReference<List<DLItem>>() {
                 }));
                 //集体地理
-                zdReultList.setJtdlData(mapper.readValue(zdReultList.getGydlList(), new TypeReference<List<DLItem>>() {
+                zdReultList.setJtdlData(mapper.readValue(zdReultList.getJtdlList(), new TypeReference<List<DLItem>>() {
                 }));
                 ztZdProjectList.setZdResult(zdReultList);
 
@@ -214,7 +214,7 @@ public class ZtZdProjectListController extends BaseController
                     qsResultList=list4.get(0);
                     qsResultList.setGyUData(mapper.readValue(qsResultList.getStateUsedList(), new TypeReference<List<QSItem>>() {
                     }));
-                    qsResultList.setJtsOData(mapper.readValue(qsResultList.getCollectiveOwnerList(), new TypeReference<List<QSItem>>() {
+                    qsResultList.setJtOData(mapper.readValue(qsResultList.getCollectiveOwnerList(), new TypeReference<List<QSItem>>() {
                     }));
                     qsResultList.setJtUData(mapper.readValue(qsResultList.getCollectiveUsedList(), new TypeReference<List<QSItem>>() {
                     }));
@@ -225,7 +225,7 @@ public class ZtZdProjectListController extends BaseController
                 qsResultList=ztZdProjectList.getQsResult();
                 qsResultList.setGyUData(mapper.readValue(qsResultList.getStateUsedList(), new TypeReference<List<QSItem>>() {
                 }));
-                qsResultList.setJtsOData(mapper.readValue(qsResultList.getCollectiveOwnerList(), new TypeReference<List<QSItem>>() {
+                qsResultList.setJtOData(mapper.readValue(qsResultList.getCollectiveOwnerList(), new TypeReference<List<QSItem>>() {
                 }));
                 qsResultList.setJtUData(mapper.readValue(qsResultList.getCollectiveUsedList(), new TypeReference<List<QSItem>>() {
                 }));
@@ -234,14 +234,14 @@ public class ZtZdProjectListController extends BaseController
 
 
             //总费用
-//            Double totalZDBC =ztZdProjectList.getZdResult()==null?0.0:ztZdProjectList.getZdResult().getTotalPay();
-//            Double totalCQBC = ztZdProjectList.getQmResult()==null?0.0:ztZdProjectList.getQmResult().getTotalPay() ;
-//            Double totalQMBC = ztZdProjectList.getCqResult() ==null?0: ztZdProjectList.getCqResult().getTotalPay();
-//            Double totalBc =totalZDBC+totalCQBC+totalQMBC;
-//            ztZdProjectList.setTotalBC(totalBc);
-//            ztZdProjectList.setTotalCQBC(ztZdProjectList.getCqResult().getTotalPay());
-//            ztZdProjectList.setTotalQMBC(ztZdProjectList.getQmResult().getTotalPay());
-//            ztZdProjectList.setTotalZDBC(ztZdProjectList.getZdResult().getTotalPay());
+            Double totalZDBC =ztZdProjectList.getZdResult()==null?0.0:ztZdProjectList.getZdResult().getTotalPay();
+            Double totalCQBC = ztZdProjectList.getQmResult()==null?0.0:ztZdProjectList.getQmResult().getTotalPay() ;
+            Double totalQMBC = ztZdProjectList.getCqResult() ==null?0: ztZdProjectList.getCqResult().getTotalPay();
+            Double totalBc =totalZDBC+totalCQBC+totalQMBC;
+            ztZdProjectList.setTotalBC(totalBc);
+            ztZdProjectList.setTotalCQBC(ztZdProjectList.getCqResult().getTotalPay());
+            ztZdProjectList.setTotalQMBC(ztZdProjectList.getQmResult().getTotalPay());
+            ztZdProjectList.setTotalZDBC(ztZdProjectList.getZdResult().getTotalPay());
 
             ClassPathResource classPathResource = new ClassPathResource("template/word/" + "03-征收补偿预估报告-03.docx");
             InputStream inputStream = classPathResource.getInputStream();

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/business/DLItem.java

@@ -9,11 +9,9 @@ public class DLItem {
     public void setMj(Double mj) {
         this.mj = mj;
     }
-
     public Double getMj() {
         return mj;
     }
-
     public void setDlbm(String dlbm) {
         this.dlbm = dlbm;
     }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/business/ZDPost.java

@@ -0,0 +1,78 @@
+package com.onemap.sanya.domain.business;
+
+import com.deepoove.poi.expression.Name;
+import com.onemap.common.core.annotation.Excel;
+
+public class ZDPost {
+    /**
+     * 项目编号
+     */
+    @Excel(name = "项目编号")
+    private String id;
+
+    /**
+     * 项目名称
+     */
+    @Excel(name = "项目名称")
+    private String projectName;
+    @Excel(name = "青苗补偿标准id")
+    private  String qmValue;
+    @Excel(name = "拆迁补偿标准id")
+    private  String cqValue;
+    @Excel(name = "征地补偿标准id")
+    private  String zdValue;
+
+    /**
+     * 分析范围
+     */
+    @Excel(name = "分析范围")
+    private String regions;
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getCqValue() {
+        return cqValue;
+    }
+
+    public String getQmValue() {
+        return qmValue;
+    }
+
+    public String getRegions() {
+        return regions;
+    }
+
+    public String getZdValue() {
+        return zdValue;
+    }
+
+    public void setCqValue(String cqValue) {
+        this.cqValue = cqValue;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public void setQmValue(String qmValue) {
+        this.qmValue = qmValue;
+    }
+
+    public void setRegions(String regions) {
+        this.regions = regions;
+    }
+
+    public void setZdValue(String zdValue) {
+        this.zdValue = zdValue;
+    }
+}

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/business/ZtBillboardmodellist.java

@@ -89,6 +89,16 @@ public class ZtBillboardmodellist extends BaseEntity
     @Excel(name = "广告牌下部")
     private String templateBottom;
 
+    /** 广告牌结果列表 */
+    @Excel(name = "广告牌结果列表")
+    private String results;
+
+    /** 广告牌视角 */
+    @Excel(name = "广告牌视角")
+    private String viewing_angle;
+
+
+
     public void setId(String id) 
     {
         this.id = id;
@@ -252,6 +262,27 @@ public class ZtBillboardmodellist extends BaseEntity
         return templateBottom;
     }
 
+    public void setresults(String results)
+    {
+        this.results = results;
+    }
+
+    public String getresults()
+    {
+        return results;
+    }
+
+    public void setviewing_angle(String viewing_angle)
+    {
+        this.viewing_angle = viewing_angle;
+    }
+
+    public String getviewing_angle()
+    {
+        return viewing_angle;
+    }
+
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -278,6 +309,8 @@ public class ZtBillboardmodellist extends BaseEntity
             .append("templateTop", getTemplateTop())
             .append("templateCentre", getTemplateCentre())
             .append("templateBottom", getTemplateBottom())
+            .append("results", getresults())
+                .append("viewing_angle", getviewing_angle())
             .toString();
     }
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/business/ZtCqBcbzList.java

@@ -24,7 +24,7 @@ public class ZtCqBcbzList extends BaseEntity
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String name;
-   private  List<ZtCqBcbzItem> items;
+   private  List<ZtCqBcbzItem> bcbz;
 
     public void setId(String id) 
     {
@@ -45,11 +45,12 @@ public class ZtCqBcbzList extends BaseEntity
         return name;
     }
 
-    public List<ZtCqBcbzItem> getItems() {
-        return items;
+    public List<ZtCqBcbzItem> getBcbz() {
+        return bcbz;
     }
-    public void setItems(List<ZtCqBcbzItem> items) {
-        this.items = items;
+
+    public void setBcbz(List<ZtCqBcbzItem> bcbz) {
+        this.bcbz = bcbz;
     }
 
     @Override

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/business/ZtZdQsResultList.java

@@ -221,7 +221,7 @@ public class ZtZdQsResultList extends BaseEntity
         this.gyUData = gyUData;
     }
 
-    public void setJtsOData(List<QSItem> jtsOData) {
+    public void setJtOData(List<QSItem> jtsOData) {
         this.jtsOData = jtsOData;
     }