市医药 后台管理

mybusiness/src/main/java/com/sooka/system/medicine/industry/domain/TGuijiMedicineIndustry.java

@@ -120,7 +120,11 @@ public class TGuijiMedicineIndustry extends BaseEntity
 
     public String getMonth()
     {
-        return month;
+        if(month != null && !month.equals("")){
+            return month + " 月";
+        }else {
+            return month;
+        }
     }
     public void setEconomyType(String economyType)
     {
@@ -147,7 +151,11 @@ public class TGuijiMedicineIndustry extends BaseEntity
 
     public String getYearOnYear()
     {
-        return yearOnYear;
+        if(yearOnYear != null && !yearOnYear.equals("")){
+            return yearOnYear + "%";
+        }else {
+            return yearOnYear;
+        }
     }
     public void setCityProportion(String cityProportion)
     {
@@ -156,7 +164,11 @@ public class TGuijiMedicineIndustry extends BaseEntity
 
     public String getCityProportion()
     {
-        return cityProportion;
+        if(cityProportion != null && !cityProportion.equals("")){
+            return cityProportion + "%";
+        }else {
+            return cityProportion;
+        }
     }
 
     @Override

mybusiness/src/main/java/com/sooka/system/medicine/plant/domain/TGuijiMedicinePlant.java

@@ -1,6 +1,8 @@
 package com.sooka.system.medicine.plant.domain;
 
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.sooka.common.annotation.Excel;
 import com.sooka.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -156,7 +158,12 @@ public class TGuijiMedicinePlant extends BaseEntity
 
     public String getPlantYear()
     {
-        return plantYear;
+        if(JSON.isValidObject(plantYear)){
+            JSONObject jsonObject = JSON.parseObject(plantYear);
+            return jsonObject.getString("value");
+        }else {
+            return plantYear;
+        }
     }
 
     @Override

mybusiness/src/main/java/com/sooka/system/medicine/platform/domain/TGuijiMedicinePlatform.java

@@ -151,7 +151,11 @@ public class TGuijiMedicinePlatform extends BaseEntity
 
     public String getPlatformAddressExt()
     {
-        return platformAddressExt;
+        if(platformAddress != null){
+            return "(" + platformAddress + ")" + platformAddressExt;
+        }else {
+            return platformAddressExt;
+        }
     }
     public void setPlatformLevel(String platformLevel)
     {

mybusiness/src/main/java/com/sooka/system/medicine/project/domain/TGuijiMedicineProject.java

@@ -63,6 +63,10 @@ public class TGuijiMedicineProject extends BaseEntity
     @Excel(name = "项目止年份")
     private String projectEnd;
 
+    /** 项目起止年限 */
+    @Excel(name = "项目起止年限")
+    private String projectStartEnd;
+
     public void setId(String id)
     {
         this.id = id;
@@ -151,7 +155,11 @@ public class TGuijiMedicineProject extends BaseEntity
 
     public String getProjectTotalInvestment()
     {
-        return projectTotalInvestment;
+        if(projectTotalInvestment != null && !projectTotalInvestment.equals("")){
+            return projectTotalInvestment + " 千万";
+        }else {
+            return projectTotalInvestment;
+        }
     }
     public void setProjectStart(String projectStart)
     {
@@ -172,6 +180,11 @@ public class TGuijiMedicineProject extends BaseEntity
         return projectEnd;
     }
 
+    public String getProjectStartEnd()
+    {
+        return ((projectStart!=null&&!projectStart.equals(""))?projectStart:"-") + " 至 " + ((projectEnd!=null&&!projectEnd.equals(""))?projectEnd:"-");
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

mybusiness/src/main/resources/mapper/system/TGuijiMedicinePlantMapper.xml

@@ -31,11 +31,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cdOperation != null  and cdOperation != ''"> and cd_operation = #{cdOperation}</if>
             <if test="cdSource != null  and cdSource != ''"> and cd_source = #{cdSource}</if>
             <if test="plantName != null  and plantName != ''"> and plantName like concat('%', #{plantName}, '%')</if>
-            <if test="plantAddress != null  and plantAddress != ''"> and plantAddress = #{plantAddress}</if>
+            <if test="plantAddress != null  and plantAddress != ''"> and plantAddress like concat('%', #{plantAddress}, '%')</if>
             <if test="plantHectare != null  and plantHectare != ''"> and plantHectare = #{plantHectare}</if>
             <if test="produceTons != null  and produceTons != ''"> and produceTons = #{produceTons}</if>
             <if test="produceValue != null  and produceValue != ''"> and produceValue = #{produceValue}</if>
-            <if test="plantYear != null  and plantYear != ''"> and plantYear = #{plantYear}</if>
+            <if test="plantYear != null  and plantYear != ''"> and plantYear like concat('%', #{plantYear}, '%')</if>
         </where>
     </select>
 

mybusiness/src/main/resources/mapper/system/TGuijiMedicinePlatformMapper.xml

@@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cdOperation != null  and cdOperation != ''"> and cd_operation = #{cdOperation}</if>
             <if test="cdSource != null  and cdSource != ''"> and cd_source = #{cdSource}</if>
             <if test="platformName != null  and platformName != ''"> and platformName like concat('%', #{platformName}, '%')</if>
-            <if test="constructingUnit != null  and constructingUnit != ''"> and constructingUnit = #{constructingUnit}</if>
+            <if test="constructingUnit != null  and constructingUnit != ''"> and constructingUnit like concat('%', #{constructingUnit}, '%')</if>
             <if test="constructingDate != null  and constructingDate != ''"> and constructingDate = #{constructingDate}</if>
             <if test="platformAddress != null  and platformAddress != ''"> and platformAddress = #{platformAddress}</if>
             <if test="platformAddressExt != null  and platformAddressExt != ''"> and platformAddressExt = #{platformAddressExt}</if>

mybusiness/src/main/resources/templates/system/medicine/industry/detail.html

@@ -8,7 +8,7 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-industry-edit" th:object="${tGuijiMedicineIndustry}">
             <input name="id" th:field="*{id}" type="hidden">
-            <div class="form-group">
+            <!--<div class="form-group">
                 <label class="col-sm-3 control-label">推送时间：</label>
                 <div class="col-sm-8">
                     <input name="cdTime" th:field="*{cdTime}" class="form-control" type="text" disabled>
@@ -31,7 +31,7 @@
                 <div class="col-sm-8">
                     <input name="cdSource" th:field="*{cdSource}" class="form-control" type="text" disabled>
                 </div>
-            </div>
+            </div>-->
             <div class="form-group">
                 <label class="col-sm-3 control-label">年份：</label>
                 <div class="col-sm-8">
@@ -47,14 +47,11 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">经济数据类型：</label>
                 <div class="col-sm-8">
-                    <select name="economyType" class="form-control m-b">
-                        <option value="">所有</option>
-                    </select>
-                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                    <input name="economyType" th:field="*{economyType}" class="form-control" type="text" disabled>
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">数值：</label>
+                <label class="col-sm-3 control-label">数值(亿元)：</label>
                 <div class="col-sm-8">
                     <input name="number" th:field="*{number}" class="form-control" type="text" disabled>
                 </div>

mybusiness/src/main/resources/templates/system/medicine/industry/industry.html

@@ -10,7 +10,7 @@
                 <form id="formId">
                     <div class="select-list">
                         <ul>
-                            <li>
+                            <!--<li>
                                 <label>推送时间：</label>
                                 <input type="text" name="cdTime"/>
                             </li>
@@ -25,23 +25,20 @@
                             <li>
                                 <label>数据来源：</label>
                                 <input type="text" name="cdSource"/>
-                            </li>
+                            </li>-->
                             <li>
                                 <label>年份：</label>
                                 <input type="text" name="year"/>
                             </li>
-                            <li>
+                            <!--<li>
                                 <label>截至月份：</label>
                                 <input type="text" name="month"/>
-                            </li>
+                            </li>-->
                             <li>
                                 <label>经济数据类型：</label>
-                                <select name="economyType">
-                                    <option value="">所有</option>
-                                    <option value="-1">代码生成请选择字典属性</option>
-                                </select>
+                                <input type="text" name="economyType"/>
                             </li>
-                            <li>
+                            <!--<li>
                                 <label>数值：</label>
                                 <input type="text" name="number"/>
                             </li>
@@ -52,7 +49,7 @@
                             <li>
                                 <label>占比全市规上：</label>
                                 <input type="text" name="cityProportion"/>
-                            </li>
+                            </li>-->
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@@ -108,7 +105,7 @@
                     title: '传感器编号',
                     visible: false
                 },
-                {
+                /*{
                     field: 'cdTime',
                     title: '推送时间'
                 },
@@ -123,7 +120,7 @@
                 {
                     field: 'cdSource',
                     title: '数据来源'
-                },
+                },*/
                 {
                     field: 'year',
                     title: '年份'
@@ -138,7 +135,7 @@
                 },
                 {
                     field: 'number',
-                    title: '数值'
+                    title: '数值(亿元)'
                 },
                 {
                     field: 'yearOnYear',

mybusiness/src/main/resources/templates/system/medicine/plant/detail.html

@@ -9,7 +9,7 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-plant-edit" th:object="${tGuijiMedicinePlant}">
             <input name="id" th:field="*{id}" type="hidden">
-            <div class="form-group">
+            <!--<div class="form-group">
                 <label class="col-sm-3 control-label">推送时间：</label>
                 <div class="col-sm-8">
                     <input name="cdTime" th:field="*{cdTime}" class="form-control" type="text">
@@ -32,7 +32,7 @@
                 <div class="col-sm-8">
                     <input name="cdSource" th:field="*{cdSource}" class="form-control" type="text">
                 </div>
-            </div>
+            </div>-->
             <div class="form-group">
                 <label class="col-sm-3 control-label">种植品种：</label>
                 <div class="col-sm-8">
@@ -46,19 +46,19 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">种植面积：</label>
+                <label class="col-sm-3 control-label">种植面积(单位:亩)：</label>
                 <div class="col-sm-8">
                     <input name="plantHectare" th:field="*{plantHectare}" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">年产量：</label>
+                <label class="col-sm-3 control-label">年产量(单位:吨)：</label>
                 <div class="col-sm-8">
                     <input name="produceTons" th:field="*{produceTons}" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">年产值：</label>
+                <label class="col-sm-3 control-label">年产值(单位:万元)：</label>
                 <div class="col-sm-8">
                     <input name="produceValue" th:field="*{produceValue}" class="form-control" type="text">
                 </div>

mybusiness/src/main/resources/templates/system/medicine/plant/plant.html

@@ -10,7 +10,7 @@
                 <form id="formId">
                     <div class="select-list">
                         <ul>
-                            <li>
+                            <!--<li>
                                 <label>推送时间：</label>
                                 <input type="text" name="cdTime"/>
                             </li>
@@ -25,7 +25,7 @@
                             <li>
                                 <label>数据来源：</label>
                                 <input type="text" name="cdSource"/>
-                            </li>
+                            </li>-->
                             <li>
                                 <label>种植品种：</label>
                                 <input type="text" name="plantName"/>
@@ -34,7 +34,7 @@
                                 <label>种植区域：</label>
                                 <input type="text" name="plantAddress"/>
                             </li>
-                            <li>
+                            <!--<li>
                                 <label>种植面积：</label>
                                 <input type="text" name="plantHectare"/>
                             </li>
@@ -45,7 +45,7 @@
                             <li>
                                 <label>年产值：</label>
                                 <input type="text" name="produceValue"/>
-                            </li>
+                            </li>-->
                             <li>
                                 <label>统计年份：</label>
                                 <input type="text" name="plantYear"/>
@@ -103,22 +103,22 @@
                     title: '传感器编号',
                     visible: false
                 },
-                {
+                /*{
                     field: 'cdTime',
                     title: '推送时间'
-                },
-                {
+                },*/
+                /*{
                     field: 'cdBatch',
                     title: '批次号'
-                },
-                {
+                },*/
+                /*{
                     field: 'cdOperation',
                     title: '操作状态'
-                },
-                {
+                },*/
+                /*{
                     field: 'cdSource',
                     title: '数据来源'
-                },
+                },*/
                 {
                     field: 'plantName',
                     title: '种植品种'
@@ -129,15 +129,15 @@
                 },
                 {
                     field: 'plantHectare',
-                    title: '种植面积'
+                    title: '种植面积(单位:亩)'
                 },
                 {
                     field: 'produceTons',
-                    title: '年产量'
+                    title: '年产量(单位:吨)'
                 },
                 {
                     field: 'produceValue',
-                    title: '年产值'
+                    title: '年产值(单位:万元)'
                 },
                 {
                     field: 'plantYear',

mybusiness/src/main/resources/templates/system/medicine/platform/detail.html

@@ -8,7 +8,7 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-platform-edit" th:object="${tGuijiMedicinePlatform}">
             <input name="id" th:field="*{id}" type="hidden">
-            <div class="form-group">
+            <!--<div class="form-group">
                 <label class="col-sm-3 control-label">推送时间：</label>
                 <div class="col-sm-8">
                     <input name="cdTime" th:field="*{cdTime}" class="form-control" type="text">
@@ -31,7 +31,7 @@
                 <div class="col-sm-8">
                     <input name="cdSource" th:field="*{cdSource}" class="form-control" type="text">
                 </div>
-            </div>
+            </div>-->
             <div class="form-group">
                 <label class="col-sm-3 control-label">平台名称：</label>
                 <div class="col-sm-8">
@@ -44,20 +44,20 @@
                     <input name="constructingUnit" th:field="*{constructingUnit}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">
+            <!--<div class="form-group">
                 <label class="col-sm-3 control-label">建设时间：</label>
                 <div class="col-sm-8">
                     <input name="constructingDate" th:field="*{constructingDate}" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">
+            </div>-->
+            <!--<div class="form-group">
                 <label class="col-sm-3 control-label">平台地址：</label>
                 <div class="col-sm-8">
                     <input name="platformAddress" th:field="*{platformAddress}" class="form-control" type="text">
                 </div>
-            </div>
+            </div>-->
             <div class="form-group">
-                <label class="col-sm-3 control-label">平台地址Ext：</label>
+                <label class="col-sm-3 control-label">平台地址：</label>
                 <div class="col-sm-8">
                     <input name="platformAddressExt" th:field="*{platformAddressExt}" class="form-control" type="text">
                 </div>
@@ -71,10 +71,7 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">平台类型：</label>
                 <div class="col-sm-8">
-                    <select name="platformType" class="form-control m-b">
-                        <option value="">所有</option>
-                    </select>
-                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                    <input name="platformLevel" th:field="*{platformType}" class="form-control" type="text">
                 </div>
             </div>
         </form>

mybusiness/src/main/resources/templates/system/medicine/platform/platform.html

@@ -10,7 +10,7 @@
                 <form id="formId">
                     <div class="select-list">
                         <ul>
-                            <li>
+                            <!--<li>
                                 <label>推送时间：</label>
                                 <input type="text" name="cdTime"/>
                             </li>
@@ -25,7 +25,7 @@
                             <li>
                                 <label>数据来源：</label>
                                 <input type="text" name="cdSource"/>
-                            </li>
+                            </li>-->
                             <li>
                                 <label>平台名称：</label>
                                 <input type="text" name="platformName"/>
@@ -34,7 +34,7 @@
                                 <label>建设单位：</label>
                                 <input type="text" name="constructingUnit"/>
                             </li>
-                            <li>
+                            <!--<li>
                                 <label>建设时间：</label>
                                 <input type="text" name="constructingDate"/>
                             </li>
@@ -56,7 +56,7 @@
                                     <option value="">所有</option>
                                     <option value="-1">代码生成请选择字典属性</option>
                                 </select>
-                            </li>
+                            </li>-->
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@@ -109,7 +109,7 @@
                     title: '传感器编号',
                     visible: false
                 },
-                {
+                /*{
                     field: 'cdTime',
                     title: '推送时间'
                 },
@@ -124,7 +124,7 @@
                 {
                     field: 'cdSource',
                     title: '数据来源'
-                },
+                },*/
                 {
                     field: 'platformName',
                     title: '平台名称'
@@ -133,18 +133,18 @@
                     field: 'constructingUnit',
                     title: '建设单位'
                 },
-                {
+                /*{
                     field: 'constructingDate',
                     title: '建设时间'
-                },
+                },*/
                 {
                     field: 'platformAddress',
                     title: '平台地址'
                 },
-                {
+                /*{
                     field: 'platformAddressExt',
                     title: '平台地址Ext'
-                },
+                },*/
                 {
                     field: 'platformLevel',
                     title: '平台级别'

mybusiness/src/main/resources/templates/system/medicine/project/detail.html

@@ -8,7 +8,7 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-project-edit" th:object="${tGuijiMedicineProject}">
             <input name="id" th:field="*{id}" type="hidden">
-            <div class="form-group">
+            <!--<div class="form-group">
                 <label class="col-sm-3 control-label">推送时间：</label>
                 <div class="col-sm-8">
                     <input name="cdTime" th:field="*{cdTime}" class="form-control" type="text">
@@ -31,7 +31,7 @@
                 <div class="col-sm-8">
                     <input name="cdSource" th:field="*{cdSource}" class="form-control" type="text">
                 </div>
-            </div>
+            </div>-->
             <div class="form-group">
                 <label class="col-sm-3 control-label">项目名称：</label>
                 <div class="col-sm-8">
@@ -53,11 +53,7 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">建设阶段：</label>
                 <div class="col-sm-8">
-                    <div class="radio-box">
-                        <input type="radio" name="projectStatus" value="">
-                        <label th:for="projectStatus" th:text="未知"></label>
-                    </div>
-                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                    <input name="projectAddress" th:field="*{projectStatus}" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">
@@ -66,17 +62,23 @@
                     <input name="projectTotalInvestment" th:field="*{projectTotalInvestment}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">
+            <!--<div class="form-group">
                 <label class="col-sm-3 control-label">项目起年份：</label>
                 <div class="col-sm-8">
                     <input name="projectStart" th:field="*{projectStart}" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">
+            </div>-->
+            <!--<div class="form-group">
                 <label class="col-sm-3 control-label">项目止年份：</label>
                 <div class="col-sm-8">
                     <input name="projectEnd" th:field="*{projectEnd}" class="form-control" type="text">
                 </div>
+            </div>-->
+            <div class="form-group">
+                <label class="col-sm-3 control-label">项目起止年限：</label>
+                <div class="col-sm-8">
+                    <input name="projectStartEnd" th:field="*{projectStartEnd}" class="form-control" type="text">
+                </div>
             </div>
         </form>
     </div>

mybusiness/src/main/resources/templates/system/medicine/project/project.html

@@ -10,7 +10,7 @@
                 <form id="formId">
                     <div class="select-list">
                         <ul>
-                            <li>
+                            <!--<li>
                                 <label>推送时间：</label>
                                 <input type="text" name="cdTime"/>
                             </li>
@@ -25,7 +25,7 @@
                             <li>
                                 <label>数据来源：</label>
                                 <input type="text" name="cdSource"/>
-                            </li>
+                            </li>-->
                             <li>
                                 <label>项目名称：</label>
                                 <input type="text" name="projectName"/>
@@ -34,7 +34,7 @@
                                 <label>项目机构：</label>
                                 <input type="text" name="projectOrgName"/>
                             </li>
-                            <li>
+                            <!--<li>
                                 <label>项目地址：</label>
                                 <input type="text" name="projectAddress"/>
                             </li>
@@ -56,7 +56,7 @@
                             <li>
                                 <label>项目止年份：</label>
                                 <input type="text" name="projectEnd"/>
-                            </li>
+                            </li>-->
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@@ -109,7 +109,7 @@
                     title: '传感器编号',
                     visible: false
                 },
-                {
+                /*{
                     field: 'cdTime',
                     title: '推送时间'
                 },
@@ -124,7 +124,7 @@
                 {
                     field: 'cdSource',
                     title: '数据来源'
-                },
+                },*/
                 {
                     field: 'projectName',
                     title: '项目名称'
@@ -145,13 +145,17 @@
                     field: 'projectTotalInvestment',
                     title: '项目总投资'
                 },
-                {
+                /*{
                     field: 'projectStart',
                     title: '项目起年份'
-                },
-                {
+                },*/
+                /*{
                     field: 'projectEnd',
                     title: '项目止年份'
+                },*/
+                {
+                    field: 'projectStartEnd',
+                    title: '项目起止年限'
                 },
                 {
                     title: '操作',