小区管理修改定时时间类型为字符串类型

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/HousingEstateMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 版本： V3.5
  * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * 作者： JNPF开发平台组
- * 日期： 2024-01-31
+ * 日期： 2024-02-04
  */
 public interface HousingEstateMapper extends BaseMapper<HousingEstateEntity> {
 

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/HousingEstateService.java

@@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
  * 版本： V3.5
  * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * 作者： JNPF开发平台组
- * 日期： 2024-01-31
+ * 日期： 2024-02-04
  */
 public interface HousingEstateService extends IService<HousingEstateEntity> {
     List<HousingEstateEntity> getList(HousingEstatePagination housingEstatePagination);

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/HousingEstateServiceImpl.java

@@ -36,7 +36,7 @@ import jnpf.permission.entity.UserEntity;
  * 版本： V3.5
  * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * 作者： JNPF开发平台组
- * 日期： 2024-01-31
+ * 日期： 2024-02-04
  */
 @Service
 public class HousingEstateServiceImpl extends ServiceImpl<HousingEstateMapper, HousingEstateEntity> implements HousingEstateService{
@@ -183,6 +183,16 @@ public class HousingEstateServiceImpl extends ServiceImpl<HousingEstateMapper, H
 
             }
 
+            if(ObjectUtil.isNotEmpty(housingEstatePagination.getAddress())){
+            housingEstateNum++;
+
+                String value = housingEstatePagination.getAddress() instanceof List ?
+                    JsonUtil.getObjectToString(housingEstatePagination.getAddress()) :
+                    String.valueOf(housingEstatePagination.getAddress());
+                housingEstateQueryWrapper.lambda().like(HousingEstateEntity::getAddress,value);
+
+            }
+
         }
         List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
         if (total>0){

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/HousingEstateController.java

@@ -34,7 +34,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @版本： V3.5
  * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * @作者： JNPF开发平台组
- * @日期： 2024-01-31
+ * @日期： 2024-02-04
  */
 @Slf4j
 @RestController

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/HousingEstateEntity.java

@@ -9,7 +9,7 @@ import java.util.Date;
  * @版本： V3.5
  * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * @作者： JNPF开发平台组
- * @日期： 2024-01-31
+ * @日期： 2024-02-04
  */
 @Data
 @TableName("nx_housing_estate")
@@ -29,9 +29,9 @@ public class HousingEstateEntity  {
     @TableField(value = "RECYCLE_ADDRESS" , updateStrategy = FieldStrategy.IGNORED)
     private String recycleAddress;
     @TableField(value = "APPOINTMENT_TIME_START" , updateStrategy = FieldStrategy.IGNORED)
-    private Date appointmentTimeStart;
+    private String appointmentTimeStart;
     @TableField(value = "APPOINTMENT_TIME_END" , updateStrategy = FieldStrategy.IGNORED)
-    private Date appointmentTimeEnd;
+    private String appointmentTimeEnd;
     @TableField("IS_CHOOSED")
     private Integer isChoosed;
     @TableField(value = "SOURCE_TYPE" , updateStrategy = FieldStrategy.IGNORED)

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/housingestate/HousingEstateForm.java

@@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @版本： V3.5
  * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * @作者： JNPF开发平台组
- * @日期： 2024-01-31
+ * @日期： 2024-02-04
  */
 @Data
 public class HousingEstateForm  {

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/housingestate/HousingEstatePagination.java

@@ -11,7 +11,7 @@ import java.util.List;
  * @版本： V3.5
  * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * @作者： JNPF开发平台组
- * @日期： 2024-01-31
+ * @日期： 2024-02-04
  */
 @Data
 public class HousingEstatePagination extends Pagination {
@@ -33,4 +33,7 @@ public class HousingEstatePagination extends Pagination {
     /** 来源 */
     @JsonProperty("sourceType")
     private Object sourceType;
+    /** 小区详细地址 */
+    @JsonProperty("address")
+    private Object address;
 }

jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/index.vue

@@ -86,7 +86,7 @@
           <el-table-column prop="incomeAmount" label="收入（元）" align="left">
             <template slot-scope="scope">
               <span v-if="scope.row.incomeAmount != null || scope.row.incomeAmount != undefined">
-                -{{scope.row.incomeAmount}}
+                +{{scope.row.incomeAmount}}
               </span>
               <span v-else></span>
             </template>
@@ -94,7 +94,7 @@
           <el-table-column prop="payoutAmount" label="支出（元）" align="left">
             <template slot-scope="scope">
               <span v-if="scope.row.payoutAmount != null || scope.row.payoutAmount != undefined">
-                +{{scope.row.payoutAmount}}
+                -{{scope.row.payoutAmount}}
               </span>
               <span v-else></span>
             </template>

jnpf-java-boot/jnpf-web/src/views/housingestate/index.vue

@@ -22,6 +22,11 @@
               </JnpfSelect>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="小区详细地址">
+              <el-input v-model="query.address" placeholder="请输入" clearable> </el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
@@ -54,6 +59,16 @@
           <el-table-column prop="address" label="小区详细地址" align="left">
           </el-table-column>
           <el-table-column prop="enabledMark" label="启用禁用" align="left">
+            <template slot-scope="scope">
+              <div v-if="scope.row.enabledMark == '开'" style="display: flex;align-items: center;">
+                <div class="green"></div>
+                <span style="margin-left:10px;">启用</span> 
+              </div>
+              <div v-else style="display: flex;align-items: center;">
+                <div class="red"></div>
+                <span style="margin-left:10px;color:#8898AA;">禁用</span> 
+              </div>
+            </template>
           </el-table-column>
           <!-- <el-table-column prop="longitude" label="经度" align="left">
             <template slot-scope="scope" v-if="scope.row.longitude">
@@ -66,12 +81,22 @@
             </template>
           </el-table-column> -->
           <el-table-column prop="hasSchedule" label="定时定点回收" align="left">
+            <template slot-scope="scope">
+              <div v-if="scope.row.hasSchedule == '开'" style="display: flex;align-items: center;">
+                <div class="green"></div>
+                <span style="margin-left:10px;">开启</span> 
+              </div>
+              <div v-else style="display: flex;align-items: center;">
+                <div class="red"></div>
+                <span style="margin-left:10px;color:#8898AA;">关闭</span> 
+              </div>
+            </template>
           </el-table-column>
-          <el-table-column prop="recycleAddress" label="定点回收地址" align="left">
+          <el-table-column prop="recycleAddress" label="回收地址" align="left">
           </el-table-column>
-          <el-table-column prop="appointmentTimeStart" label="定点回收时间起" align="left">
+          <el-table-column prop="appointmentTimeStart" label="回收时间起" align="left">
           </el-table-column>
-          <el-table-column prop="appointmentTimeEnd" label="定点回收时间止" align="left">
+          <el-table-column prop="appointmentTimeEnd" label="回收时间止" align="left">
           </el-table-column>
           <el-table-column label="来源" prop="sourceType" algin="left">
             <template slot-scope="scope">
@@ -149,6 +174,7 @@ export default {
       query: {
         name: undefined,
         sourceType: undefined,
+        address: undefined,
       },
       treeProps: {
         children: 'children',
@@ -464,3 +490,18 @@ export default {
   }
 }
 </script>
+<style scoped>
+.green {
+  width: 10px;
+  height: 10px;
+  border-radius: 50%;
+  background-color: rgb(95, 197, 146);
+}
+.red {
+  width: 10px;
+  height: 10px;
+  border-radius: 50%;
+  background-color: rgb(219, 111, 111);
+}
+
+</style>