加入保养标准

java110-bean/src/main/java/com/java110/dto/maintainanceStandardItem/MaintainanceStandardItemDto.java

@@ -1,6 +1,8 @@
 package com.java110.dto.maintainanceStandardItem;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.maintainanceItem.MaintainanceItemDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -12,12 +14,12 @@ import java.util.Date;
  * @Version 1.0
  * add by wuxw 2019/4/24
  **/
-public class MaintainanceStandardItemDto extends PageDto implements Serializable {
+public class MaintainanceStandardItemDto extends MaintainanceItemDto implements Serializable {
 
     private String itemId;
-private String standardId;
-private String msiId;
-private String communityId;
+    private String standardId;
+    private String msiId;
+    private String communityId;
 
 
     private Date createTime;
@@ -28,25 +30,32 @@ private String communityId;
     public String getItemId() {
         return itemId;
     }
-public void setItemId(String itemId) {
+
+    public void setItemId(String itemId) {
         this.itemId = itemId;
     }
-public String getStandardId() {
+
+    public String getStandardId() {
         return standardId;
     }
-public void setStandardId(String standardId) {
+
+    public void setStandardId(String standardId) {
         this.standardId = standardId;
     }
-public String getMsiId() {
+
+    public String getMsiId() {
         return msiId;
     }
-public void setMsiId(String msiId) {
+
+    public void setMsiId(String msiId) {
         this.msiId = msiId;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
 

java110-db/src/main/resources/mapper/community/MaintainanceStandardItemV1ServiceDaoImplMapper.xml

@@ -18,8 +18,9 @@
     <!-- 查询保养标准信息 add by wuxw 2018-07-03 -->
     <select id="getMaintainanceStandardItemInfo" parameterType="Map" resultType="Map">
         select t.item_id,t.item_id itemId,t.standard_id,t.standard_id standardId,t.status_cd,t.status_cd
-        statusCd,t.msi_id,t.msi_id msiId,t.community_id,t.community_id communityId
+        statusCd,t.msi_id,t.msi_id msiId,t.community_id,t.community_id communityId,mi.item_title itemTitle
         from maintainance_standard_item t
+        left join maintainance_item mi on t.item_id = mi.item_id and mi.status_cd = '0'
         where 1 =1
         <if test="itemId !=null and itemId != ''">
             and t.item_id= #{itemId}

service-community/src/main/java/com/java110/community/cmd/maintainance/SaveMaintainanceStandardItemCmd.java

@@ -55,8 +55,8 @@ public class SaveMaintainanceStandardItemCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "standardId", "请求报文中未包含standardId");
-Assert.hasKeyAndValue(reqJson, "itemId", "请求报文中未包含itemId");
-Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
+        Assert.hasKeyAndValue(reqJson, "itemId", "请求报文中未包含itemId");
+        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
 
     }
 
@@ -64,7 +64,7 @@ Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含community
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-       MaintainanceStandardItemPo maintainanceStandardItemPo = BeanConvertUtil.covertBean(reqJson, MaintainanceStandardItemPo.class);
+        MaintainanceStandardItemPo maintainanceStandardItemPo = BeanConvertUtil.covertBean(reqJson, MaintainanceStandardItemPo.class);
         maintainanceStandardItemPo.setMsiId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
         int flag = maintainanceStandardItemV1InnerServiceSMOImpl.saveMaintainanceStandardItem(maintainanceStandardItemPo);
 

service-community/src/main/java/com/java110/community/cmd/maintainance/UpdateMaintainanceStandardItemCmd.java

@@ -1,74 +0,0 @@
-/*
- * Copyright 2017-2020 吴学文 and java110 team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.java110.community.cmd.maintainance;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.Cmd;
-import com.java110.core.event.cmd.CmdEvent;
-import com.java110.intf.community.IMaintainanceStandardItemV1InnerServiceSMO;
-import com.java110.po.maintainanceStandardItem.MaintainanceStandardItemPo;
-import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * 类表述：更新
- * 服务编码：maintainanceStandardItem.updateMaintainanceStandardItem
- * 请求路劲：/app/maintainanceStandardItem.UpdateMaintainanceStandardItem
- * add by 吴学文 at 2022-11-06 17:20:01 mail: 928255095@qq.com
- * open source address: https://gitee.com/wuxw7/MicroCommunity
- * 官网：http://www.homecommunity.cn
- * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
- * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
- */
-@Java110Cmd(serviceCode = "maintainance.updateMaintainanceStandardItem")
-public class UpdateMaintainanceStandardItemCmd extends Cmd {
-
-  private static Logger logger = LoggerFactory.getLogger(UpdateMaintainanceStandardItemCmd.class);
-
-
-    @Autowired
-    private IMaintainanceStandardItemV1InnerServiceSMO maintainanceStandardItemV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "msiId", "msiId不能为空");
-Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
-
-    }
-
-    @Override
-    @Java110Transactional
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-       MaintainanceStandardItemPo maintainanceStandardItemPo = BeanConvertUtil.covertBean(reqJson, MaintainanceStandardItemPo.class);
-        int flag = maintainanceStandardItemV1InnerServiceSMOImpl.updateMaintainanceStandardItem(maintainanceStandardItemPo);
-
-        if (flag < 1) {
-            throw new CmdException("更新数据失败");
-        }
-
-        cmdDataFlowContext.setResponseEntity(ResultVo.success());
-    }
-}